From 8c98b34228abb4dfde822ad89106b4d8b2287639 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 7 Aug 2012 22:16:03 +0200 Subject: Imported Upstream version 0.9.6.0 --- src/nm-device-vlan.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/nm-device-vlan.c') diff --git a/src/nm-device-vlan.c b/src/nm-device-vlan.c index b9c93234..59d95554 100644 --- a/src/nm-device-vlan.c +++ b/src/nm-device-vlan.c @@ -636,7 +636,11 @@ nm_device_vlan_new (const char *udi, const char *iface, NMDevice *parent) int vlan_id; itype = nm_system_get_iface_type (ifindex, iface); - g_assert (itype == NM_IFACE_TYPE_VLAN); + if (itype != NM_IFACE_TYPE_VLAN) { + nm_log_err (LOGD_DEVICE, "(%s): failed to get VLAN interface type.", iface); + g_object_unref (device); + return NULL; + } if (!nm_system_get_iface_vlan_info (ifindex, &parent_ifindex, &vlan_id)) { nm_log_warn (LOGD_DEVICE, "(%s): failed to get VLAN interface info.", iface); -- cgit 1.3.0-6-gf8a5