GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-25 16:11:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

Browse source
This commit is contained in:
John W. Linville 2014-09-08 11:14:56 -04:00
commit 61a3d4f9d5
25 changed files with 86 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
net/mac80211/chan.c
View file

@ -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;