mac80211: warn on some invalid vlan operations

[linux-2.6-omap-h63xx.git] / net / mac80211 / main.c

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index c532043c1a1c001eb41fe7c5ee1c94f125f80c65..dd838b725afbd3c54e565cc33b0acd047b5987da 100644 (file)
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -156,6 +156,9 @@ int ieee80211_if_config(struct ieee80211_sub_if_data *sdata, u32 changed)
        if (WARN_ON(!netif_running(sdata->dev)))
                return 0;
 
+       if (WARN_ON(sdata->vif.type == NL80211_IFTYPE_AP_VLAN))
+               return -EINVAL;
+
        if (!local->ops->config_interface)
                return 0;
 
@@ -321,6 +324,9 @@ void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata,
 {
        struct ieee80211_local *local = sdata->local;
 
+       if (WARN_ON(sdata->vif.type == NL80211_IFTYPE_AP_VLAN))
+               return;
+
        if (!changed)
                return;