[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, 5 insertions, 0 deletions

diff --git a/net/mac80211/ieee80211_iface.c b/net/mac80211/ieee80211_iface.c
index f9c74bb09d31..4590205fdf4b 100644
--- a/net/mac80211/ieee80211_iface.c
+++ b/net/mac80211/ieee80211_iface.c
@@ -164,6 +164,7 @@ void ieee80211_if_set_type(struct net_device *dev, int type)
                 sdata->bss = NULL;
                 break;
         case IEEE80211_IF_TYPE_VLAN:
+                sdata->u.vlan.ap = NULL;
                 break;
         case IEEE80211_IF_TYPE_AP:
                 sdata->u.ap.dtim_period = 2;
@@ -171,6 +172,7 @@ void ieee80211_if_set_type(struct net_device *dev, int type)
                 sdata->u.ap.max_ratectrl_rateidx = -1;
                 skb_queue_head_init(&sdata->u.ap.ps_bc_buf);
                 sdata->bss = &sdata->u.ap;
+                INIT_LIST_HEAD(&sdata->u.ap.vlans);
                 break;
         case IEEE80211_IF_TYPE_STA:
         case IEEE80211_IF_TYPE_IBSS: {
@@ -284,6 +286,9 @@ void ieee80211_if_reinit(struct net_device *dev)
         case IEEE80211_IF_TYPE_MNTR:
                 dev->type = ARPHRD_ETHER;
                 break;
+        case IEEE80211_IF_TYPE_VLAN:
+                sdata->u.vlan.ap = NULL;
+                break;
         }
 
         /* remove all STAs that are bound to this virtual interface */