diff options
| author | Michael Biebl <biebl@debian.org> | 2022-12-18 21:32:59 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2022-12-18 21:32:59 +0100 |
| commit | f08ae1668e2f4f5ad4649eb7e47730625026bca2 (patch) | |
| tree | c836083cba838563c5b333696b796cf28a6a1b0b /src/core/devices/nm-device-macsec.c | |
| parent | bfd2ca916ff5aa53d394178c3beeb17680a0e2c5 (diff) | |
| parent | 2965dc70bb3cbfa8de2f279761812b84b87600cb (diff) | |
Update upstream source from tag 'upstream/1.40.8'
Update to upstream version '1.40.8' with Debian dir 5c809f5de1842697051e414edf8c873684b9b3fe
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. |