From 68bb65fbab309b7b6322816eb661acb93ce51a67 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Sun, 8 Sep 2013 12:03:27 -0400 Subject: [PATCH] core: fix nm_device_supports_vlans() The platform knows which device types support VLANs, so just ask it, rather than only doing VLANs on ethernet. --- src/devices/nm-device.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 4130212f05..80e0cd0642 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -41,7 +41,6 @@ #include "nm-glib-compat.h" #include "nm-device.h" #include "nm-device-private.h" -#include "nm-device-ethernet.h" #include "NetworkManagerUtils.h" #include "nm-platform.h" #include "nm-rdisc.h" @@ -6644,8 +6643,7 @@ cp_connection_updated (NMConnectionProvider *cp, NMConnection *connection, gpoin gboolean nm_device_supports_vlans (NMDevice *device) { - /* At the moment, NM's VLAN code assumes all VLANs are over ethernet. */ - return NM_IS_DEVICE_ETHERNET (device); + return nm_platform_link_supports_vlans (nm_device_get_ifindex (device)); } gboolean