diff options
| author | Michael Biebl <biebl@debian.org> | 2012-06-29 20:12:44 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2012-06-29 20:12:44 +0200 |
| commit | 867254ea7c2b193fecf8cd36cc6e5dc53c290d92 (patch) | |
| tree | 7c698b403882736ab70c3efd524c3460f08c391c /src/nm-device-vlan.c | |
| parent | de06e5715e780baade318f3490ac7a4c9ce84e32 (diff) | |
Imported Upstream version 0.9.5.95 upstream/0.9.5.95
Diffstat (limited to 'src/nm-device-vlan.c')
| -rw-r--r-- | src/nm-device-vlan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nm-device-vlan.c b/src/nm-device-vlan.c index 14be849f..b9c93234 100644 --- a/src/nm-device-vlan.c +++ b/src/nm-device-vlan.c @@ -643,17 +643,17 @@ nm_device_vlan_new (const char *udi, const char *iface, NMDevice *parent) g_object_unref (device); return NULL; } - priv->vlan_id = vlan_id; if ( parent_ifindex < 0 || parent_ifindex != nm_device_get_ip_ifindex (parent) - || priv->vlan_id < 0) { + || vlan_id < 0) { nm_log_warn (LOGD_DEVICE, "(%s): VLAN parent ifindex (%d) or VLAN ID (%d) invalid.", iface, parent_ifindex, priv->vlan_id); g_object_unref (device); return NULL; } + priv->vlan_id = vlan_id; priv->parent = g_object_ref (parent); priv->parent_state_id = g_signal_connect (priv->parent, "state-changed", |