summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-07-25 16:20:22 +0200
committerJohannes Berg <johannes.berg@intel.com>2014-08-26 11:12:37 +0200
commit0e67c13667a72093aa3ef3cb54dd521e34e500fc (patch)
tree6cfdbeaf84fc57f8ca95c332835291ba767dbd61 /net
parentRevert "mac80211: disable uAPSD if all ACs are under ACM" (diff)
downloadlinux-0e67c13667a72093aa3ef3cb54dd521e34e500fc.tar.xz
linux-0e67c13667a72093aa3ef3cb54dd521e34e500fc.zip
mac80211: ignore AP_VLAN in ieee80211_recalc_chanctx_chantype
When bringing down the AP, a WARN_ON is hit because the bss config chandef is empty here. Since AP_VLAN channel settings do not matter for anything chanctx related (always inherits the settings from the AP interface), let's just ignore it here. Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/chan.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c
index 6d537f03c0ba..4206a11bf8d7 100644
--- a/net/mac80211/chan.c
+++ b/net/mac80211/chan.c
@@ -541,6 +541,8 @@ static void ieee80211_recalc_chanctx_chantype(struct ieee80211_local *local,
continue;
if (rcu_access_pointer(sdata->vif.chanctx_conf) != conf)
continue;
+ if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
+ continue;
if (!compat)
compat = &sdata->vif.bss_conf.chandef;