diff options
| author | Michael Biebl <biebl@debian.org> | 2023-08-09 21:56:59 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2023-08-09 21:56:59 +0200 |
| commit | b1206f287e4fae1f9a7e29ec0dc11b54d726a7f8 (patch) | |
| tree | cc1d62cd21f10b2375c76484b5e2187f1e75f010 /src/core/devices/nm-device-vlan.c | |
| parent | a6d4d07b23485507f30ddb1ce99f5c82428714c8 (diff) | |
| parent | 05e4a733f2141995181a551854d5df929f084adf (diff) | |
Update upstream source from tag 'upstream/1.44.0'
Update to upstream version '1.44.0' with Debian dir e69e19b54914190e7696747b3e0508f95977f387
Diffstat (limited to 'src/core/devices/nm-device-vlan.c')
| -rw-r--r-- | src/core/devices/nm-device-vlan.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/core/devices/nm-device-vlan.c b/src/core/devices/nm-device-vlan.c index feb011db..7849e724 100644 --- a/src/core/devices/nm-device-vlan.c +++ b/src/core/devices/nm-device-vlan.c @@ -303,17 +303,20 @@ is_available(NMDevice *device, NMDeviceCheckDevAvailableFlags flags) /*****************************************************************************/ static gboolean -check_connection_compatible(NMDevice *device, NMConnection *connection, GError **error) +check_connection_compatible(NMDevice *device, + NMConnection *connection, + gboolean check_properties, + GError **error) { NMDeviceVlanPrivate *priv = NM_DEVICE_VLAN_GET_PRIVATE(device); NMSettingVlan *s_vlan; const char *parent; if (!NM_DEVICE_CLASS(nm_device_vlan_parent_class) - ->check_connection_compatible(device, connection, error)) + ->check_connection_compatible(device, connection, check_properties, error)) return FALSE; - if (nm_device_is_real(device)) { + if (check_properties && nm_device_is_real(device)) { s_vlan = nm_connection_get_setting_vlan(connection); if (nm_setting_vlan_get_id(s_vlan) != priv->vlan_id) { |