diff options
| author | Michael Biebl <biebl@debian.org> | 2022-01-13 22:34:27 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2022-01-13 22:34:27 +0100 |
| commit | dd97d276b5d70c3397a4e59c978ca5228f06ba44 (patch) | |
| tree | 5fb3f5e0f5da28e39d3261d50561349a512ba297 /src/core/devices/nm-device-vlan.c | |
| parent | 3e2f6719468f8d957ae3cb112f3cb75b9c82d6a7 (diff) | |
| parent | 88c227d90a6b7b388c5c85d72802a0ca8f05ed5c (diff) | |
Update upstream source from tag 'upstream/1.34.0'
Update to upstream version '1.34.0' with Debian dir b598c27ee9cef517760bc745aa6a3bb7d9fb2ecb
Diffstat (limited to 'src/core/devices/nm-device-vlan.c')
| -rw-r--r-- | src/core/devices/nm-device-vlan.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/core/devices/nm-device-vlan.c b/src/core/devices/nm-device-vlan.c index 548245f8..d1e57411 100644 --- a/src/core/devices/nm-device-vlan.c +++ b/src/core/devices/nm-device-vlan.c @@ -19,6 +19,7 @@ #include "libnm-platform/nm-platform.h" #include "nm-device-factory.h" #include "nm-manager.h" +#include "libnm-core-aux-intern/nm-libnm-core-utils.h" #include "libnm-core-intern/nm-core-internal.h" #include "libnm-platform/nmp-object.h" #include "libnm-platform/nm-platform-utils.h" @@ -432,18 +433,13 @@ static void update_connection(NMDevice *device, NMConnection *connection) { NMDeviceVlanPrivate * priv = NM_DEVICE_VLAN_GET_PRIVATE(device); - NMSettingVlan * s_vlan = nm_connection_get_setting_vlan(connection); + NMSettingVlan * s_vlan = _nm_connection_ensure_setting(connection, NM_TYPE_SETTING_VLAN); int ifindex = nm_device_get_ifindex(device); const NMPlatformLink *plink; const NMPObject * polnk; guint vlan_id; _NMVlanFlags vlan_flags; - if (!s_vlan) { - s_vlan = (NMSettingVlan *) nm_setting_vlan_new(); - nm_connection_add_setting(connection, (NMSetting *) s_vlan); - } - polnk = nm_platform_link_get_lnk(nm_device_get_platform(device), ifindex, NM_LINK_TYPE_VLAN, |