[PATCH] mac80211: validate VLAN interfaces better

This patch changes mac80211 to verify that VLAN interfaces
are valid and not bother drivers about them any more.
VLAN interfaces are now only valid when an AP interface
is up with the same MAC address, and are automatically
turned off when the AP interface is set down.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Cc: Jouni Malinen <j@w1.fi>
Signed-off-by: Michael Wu <flamingice@sourmilk.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 9 insertions, 8 deletions

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 855754d4c50d..494a4c022a9b 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -442,16 +442,17 @@ struct ieee80211_conf {
  * @IEEE80211_IF_TYPE_IBSS: interface in IBSS (ad-hoc) mode.
  * @IEEE80211_IF_TYPE_MNTR: interface in monitor (rfmon) mode.
  * @IEEE80211_IF_TYPE_WDS: interface in WDS mode.
- * @IEEE80211_IF_TYPE_VLAN: not used.
+ * @IEEE80211_IF_TYPE_VLAN: VLAN interface bound to an AP, drivers
+ *      will never see this type.
  */
 enum ieee80211_if_types {
-        IEEE80211_IF_TYPE_AP = 0x00000000,
-        IEEE80211_IF_TYPE_MGMT = 0x00000001,
-        IEEE80211_IF_TYPE_STA = 0x00000002,
-        IEEE80211_IF_TYPE_IBSS = 0x00000003,
-        IEEE80211_IF_TYPE_MNTR = 0x00000004,
-        IEEE80211_IF_TYPE_WDS = 0x5A580211,
-        IEEE80211_IF_TYPE_VLAN = 0x00080211,
+        IEEE80211_IF_TYPE_AP,
+        IEEE80211_IF_TYPE_MGMT,
+        IEEE80211_IF_TYPE_STA,
+        IEEE80211_IF_TYPE_IBSS,
+        IEEE80211_IF_TYPE_MNTR,
+        IEEE80211_IF_TYPE_WDS,
+        IEEE80211_IF_TYPE_VLAN,
 };
 
 /**