diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2008-09-11 00:02:00 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-09-15 16:48:23 -0400 |
| commit | 7a725f73403e874ec52c58741e9b98cd604dbd03 (patch) | |
| tree | c3f31b92ce014f30559a0d6a579a38f2ed15e678 /net/mac80211 | |
| parent | 0d143fe1e2efc084fa730d2dfa22d0d1ca2ee5f1 (diff) | |
| download | linux-3.10-7a725f73403e874ec52c58741e9b98cd604dbd03.tar.gz linux-3.10-7a725f73403e874ec52c58741e9b98cd604dbd03.tar.bz2 linux-3.10-7a725f73403e874ec52c58741e9b98cd604dbd03.zip | |
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 <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/main.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index c532043c1a1..dd838b725af 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; |