summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2015-06-26 15:43:16 +0200
committerLubomir Rintel <lkundrak@v3.sk>2015-06-26 15:52:10 +0200
commit8a1f4beb65111b88b1114afac96c33a9970301c5 (patch)
tree59161296a9943581d9da6332097b46d4e934c955
parent348452f1e06e9bde9f84b90db4f5620ee672389a (diff)
downloadNetworkManager-8a1f4beb65111b88b1114afac96c33a9970301c5.tar.gz
linux-platform: don't try to read vlan id from netlink objects without type set
They just don't have the information.
-rw-r--r--src/platform/nm-linux-platform.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
index eea117a979..9d83e54221 100644
--- a/src/platform/nm-linux-platform.c
+++ b/src/platform/nm-linux-platform.c
@@ -1000,7 +1000,7 @@ _nmp_vt_cmd_plobj_init_from_nl_link (NMPlatform *platform, NMPlatformObject *_ob
obj->mtu = rtnl_link_get_mtu (nlo);
obj->arptype = rtnl_link_get_arptype (nlo);
- if (obj->type == NM_LINK_TYPE_VLAN)
+ if (!g_strcmp0 (rtnl_link_get_type (nlo), "vlan"))
obj->vlan_id = rtnl_link_vlan_get_id (nlo);
if ((nladdr = rtnl_link_get_addr (nlo))) {