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-macsec.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-macsec.c')
| -rw-r--r-- | src/core/devices/nm-device-macsec.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/devices/nm-device-macsec.c b/src/core/devices/nm-device-macsec.c index 5cc0b8da..5b1f5fdc 100644 --- a/src/core/devices/nm-device-macsec.c +++ b/src/core/devices/nm-device-macsec.c @@ -187,8 +187,7 @@ update_properties(NMDevice *device) g_object_freeze_notify((GObject *) device); - if (priv->props.parent_ifindex != props->parent_ifindex) - nm_device_parent_set_ifindex(device, props->parent_ifindex); + nm_device_parent_set_ifindex(device, plink->parent); #define CHECK_PROPERTY_CHANGED(field, prop) \ G_STMT_START \ @@ -402,7 +401,7 @@ supplicant_iface_state_is_completed(NMDeviceMacsec *self, NMSupplicantInterfaceS nm_clear_g_source(&priv->supplicant.lnk_timeout_id); nm_clear_g_source(&priv->supplicant.con_timeout_id); - nm_device_bring_up(NM_DEVICE(self), TRUE, NULL); + nm_device_bring_up(NM_DEVICE(self)); /* If this is the initial association during device activation, * schedule the next activation stage. |