浏览代码

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>
Felix Fietkau 11 年之前
父节点
当前提交
0e67c13667
共有 1 个文件被更改,包括 2 次插入0 次删除
  1. 2 0
      net/mac80211/chan.c

+ 2 - 0
net/mac80211/chan.c

@@ -541,6 +541,8 @@ static void ieee80211_recalc_chanctx_chantype(struct ieee80211_local *local,
 			continue;
 			continue;
 		if (rcu_access_pointer(sdata->vif.chanctx_conf) != conf)
 		if (rcu_access_pointer(sdata->vif.chanctx_conf) != conf)
 			continue;
 			continue;
+		if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
+			continue;
 
 
 		if (!compat)
 		if (!compat)
 			compat = &sdata->vif.bss_conf.chandef;
 			compat = &sdata->vif.bss_conf.chandef;