diff options
| author | Jeremy Bicha <jeremy.bicha@canonical.com> | 2023-01-04 18:29:22 -0500 |
|---|---|---|
| committer | Jeremy Bicha <jeremy.bicha@canonical.com> | 2023-01-04 18:29:22 -0500 |
| commit | b40fb4d87dea97023ceae223cc8f3ded60726fe0 (patch) | |
| tree | 26768660a2db4134bde3c42e99bf1c84fb631adf /src/core/devices/nm-device-bond.c | |
| parent | 47995cc5a8e379555be2d010c4201bdc56c8fca4 (diff) | |
| parent | b2ca000f0e0a915aba25f7d16b34bd092055ad59 (diff) | |
Merge tag 'debian/1.40.8-1' into ubuntu/master
network-manager Debian release 1.40.8-1
Diffstat (limited to 'src/core/devices/nm-device-bond.c')
| -rw-r--r-- | src/core/devices/nm-device-bond.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/devices/nm-device-bond.c b/src/core/devices/nm-device-bond.c index 3e083de4..10765b60 100644 --- a/src/core/devices/nm-device-bond.c +++ b/src/core/devices/nm-device-bond.c @@ -492,7 +492,7 @@ act_stage1_prepare(NMDevice *device, NMDeviceStateReason *out_failure_reason) /* This is a workaround because netlink do not support ifname as primary */ set_bond_attr_or_default(device, s_bond, NM_SETTING_BOND_OPTION_PRIMARY); - nm_device_bring_up(device, TRUE, NULL); + nm_device_bring_up(device); return ret; } @@ -540,7 +540,7 @@ attach_port(NMDevice *device, success = nm_platform_link_enslave(nm_device_get_platform(device), nm_device_get_ip_ifindex(device), nm_device_get_ip_ifindex(port)); - nm_device_bring_up(port, TRUE, NULL); + nm_device_bring_up(port); if (!success) { _LOGI(LOGD_BOND, "attaching bond port %s: failed", nm_device_get_ip_iface(port)); @@ -613,7 +613,7 @@ detach_port(NMDevice *device, NMDevice *port, gboolean configure) * other state is noticed by the now-released slave. */ if (ifindex_slave > 0) { - if (!nm_device_bring_up(port, TRUE, NULL)) + if (!nm_device_bring_up(port)) _LOGW(LOGD_BOND, "detached bond port could not be brought up."); } } else { |