projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'regulator/fix/da9211', 'regulator/fix/ltc3589' and...
[cascardo/linux.git]
/
net
/
mac80211
/
chan.c
diff --git
a/net/mac80211/chan.c
b/net/mac80211/chan.c
index
0375009
..
399ad82
100644
(file)
--- 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;