diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-09-08 11:14:56 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-09-08 11:14:56 -0400 |
| commit | 61a3d4f9d52c00b2016bc27fc66b10a194043f76 (patch) | |
| tree | 938a7bd50bbef0215a20dfec99007b4c30828019 /net/mac80211/chan.c | |
| parent | db906eb2101b0564b0c65edf4a8647395196342e (diff) | |
| parent | 1bd3fa7b8c9b2936c16c6e6452f9cc991c405872 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'net/mac80211/chan.c')
| -rw-r--r-- | net/mac80211/chan.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c index 0da6f3a027e7..4c74e8da64b9 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, | |||
| 541 | continue; | 541 | continue; |
| 542 | if (rcu_access_pointer(sdata->vif.chanctx_conf) != conf) | 542 | if (rcu_access_pointer(sdata->vif.chanctx_conf) != conf) |
| 543 | continue; | 543 | continue; |
| 544 | if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) | ||
| 545 | continue; | ||
| 544 | 546 | ||
| 545 | if (!compat) | 547 | if (!compat) |
| 546 | compat = &sdata->vif.bss_conf.chandef; | 548 | compat = &sdata->vif.bss_conf.chandef; |