summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2016-01-10 12:52:10 +0100
committerThomas Haller <thaller@redhat.com>2016-01-11 14:05:49 +0100
commit225ce48b8ad37029cee0bddac4575e44755ccfb7 (patch)
tree2ac1441eb1a767b6e6a37e71f9726def921d8f5d
parent492691dfb2e4f839b30bc693e7a2756facb9e3ca (diff)
downloadNetworkManager-225ce48b8ad37029cee0bddac4575e44755ccfb7.tar.gz
device/vlan: remove unreachable code from realize()
plnk->id is unsigned. It cannot be negative.
-rw-r--r--src/devices/nm-device-vlan.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/devices/nm-device-vlan.c b/src/devices/nm-device-vlan.c
index 47047b1999..a6bb8123da 100644
--- a/src/devices/nm-device-vlan.c
+++ b/src/devices/nm-device-vlan.c
@@ -183,18 +183,12 @@ realize (NMDevice *device,
return FALSE;
}
- if (plnk->id < 0) {
- g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED,
- "(%s): VLAN ID invalid", plink->name);
- return FALSE;
- }
-
if (plink->parent != NM_PLATFORM_LINK_OTHER_NETNS) {
parent = nm_manager_get_device_by_ifindex (nm_manager_get (), plink->parent);
if (!parent) {
nm_log_dbg (LOGD_HW, "(%s): VLAN parent interface unknown", plink->name);
g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED,
- "(%s): VLAN parent interface unknown", plink->name);
+ "(%s): VLAN parent interface unknown", plink->name);
return FALSE;
}
} else