fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-25 14:10:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

bond: merge branch 'ff/fix_bond_typo'

Browse source 
https://bugs.launchpad.net/network-manager/+bug/1987001
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/1072

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1347

(cherry picked from commit 2af8645f71)
This commit is contained in:
Thomas Haller 2022-08-25 15:37:15 +02:00
commit 89367de3eb
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/devices/nm-device-bond.c
View file

@ -461,7 +461,7 @@ _platform_lnk_bond_init_from_setting(NMSettingBond *s_bond, NMPlatformLnkBond *p
props->peer_notif_delay_has = (props->miimon || props->arp_interval) && props->peer_notif_delay;
props->arp_all_targets_has = props->arp_interval && props->arp_all_targets;
props->resend_igmp_has = props->resend_igmp != 1;
props->lp_interval = props->lp_interval != 1;
props->lp_interval_has = props->lp_interval != 1;
props->tlb_dynamic_lb_has = NM_IN_SET(props->mode, NM_BOND_MODE_TLB, NM_BOND_MODE_ALB);
}

2
src/libnm-core-aux-intern/nm-libnm-core-utils.c
View file

@ -51,7 +51,7 @@ NM_UTILS_STRING_TABLE_LOOKUP_DEFINE(
}
},
{ return NM_BOND_AD_SELECT_STABLE; },
{"bandwith", NM_BOND_AD_SELECT_BANDWIDTH},
{"bandwidth", NM_BOND_AD_SELECT_BANDWIDTH},
{"count", NM_BOND_AD_SELECT_COUNT},
{"stable", NM_BOND_AD_SELECT_STABLE}, );