From: Johannes Berg Date: Wed, 10 Sep 2008 22:02:00 +0000 (+0200) Subject: mac80211: warn on some invalid vlan operations X-Git-Tag: MMI-PSA29.97-13-9~31818^2~268^2~25 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7a725f73403e874ec52c58741e9b98cd604dbd03;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git mac80211: warn on some invalid vlan operations These should never happen, but better warn about them than crashing a driver, the fact that they never happen is rather subtle throughout mac80211. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville --- diff --git a/net/mac80211/main.c b/net/mac80211/main.c index c532043c1a1c..dd838b725afb 100644 --- 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;