diff options
author | Dan Williams <dcbw@redhat.com> | 2014-10-09 12:42:29 -0500 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2015-12-04 12:16:41 +0100 |
commit | 20906ca7a338661776a0a8364e41df9fd0ee3467 (patch) | |
tree | 5193316fb04f0b16aa1ebc901a2da0c77c2212c4 /src/devices/nm-device-vlan.c | |
parent | 4dbaac4ba24ebc8b257fffe5197cc8e362804a58 (diff) | |
download | NetworkManager-20906ca7a338661776a0a8364e41df9fd0ee3467.tar.gz |
core: ensure platform links are compatible with the NMDevice
Ensure the platform link with the same interface name as the
NMDevice is actually compatible with it before using the link
for initialization of device properties. If not, remove the
NMDevice and create a new one since there are kernel resources
with a different type.
Diffstat (limited to 'src/devices/nm-device-vlan.c')
-rw-r--r-- | src/devices/nm-device-vlan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/devices/nm-device-vlan.c b/src/devices/nm-device-vlan.c index 58263c5d0c..734a483bdc 100644 --- a/src/devices/nm-device-vlan.c +++ b/src/devices/nm-device-vlan.c @@ -667,7 +667,7 @@ nm_device_vlan_class_init (NMDeviceVlanClass *klass) GObjectClass *object_class = G_OBJECT_CLASS (klass); NMDeviceClass *parent_class = NM_DEVICE_CLASS (klass); - parent_class->connection_type = NM_SETTING_VLAN_SETTING_NAME; + NM_DEVICE_CLASS_DECLARE_TYPES (klass, NM_SETTING_VLAN_SETTING_NAME, NM_LINK_TYPE_VLAN) g_type_class_add_private (object_class, sizeof (NMDeviceVlanPrivate)); |