diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-03-07 21:09:32 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-03-07 21:09:32 +0100 |
| commit | 97bd5f0054ee879d778f4c7501ee2f88a9981ce2 (patch) | |
| tree | 61f390b9bcad634f167e93b6154cbe6439d2057e /net/mac80211/chan.c | |
| parent | ipv6: don't set DST_NOCOUNT for remotely added routes (diff) | |
| parent | mwifiex: save and copy AP's VHT capability info correctly (diff) | |
| download | linux-97bd5f0054ee879d778f4c7501ee2f88a9981ce2.tar.xz linux-97bd5f0054ee879d778f4c7501ee2f88a9981ce2.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/mac80211/chan.c')
| -rw-r--r-- | net/mac80211/chan.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c index f43613a97dd6..0c1ecfdf9a12 100644 --- a/net/mac80211/chan.c +++ b/net/mac80211/chan.c @@ -100,6 +100,12 @@ ieee80211_get_chanctx_max_required_bw(struct ieee80211_local *local, } max_bw = max(max_bw, width); } + + /* use the configured bandwidth in case of monitor interface */ + sdata = rcu_dereference(local->monitor_sdata); + if (sdata && rcu_access_pointer(sdata->vif.chanctx_conf) == conf) + max_bw = max(max_bw, conf->def.width); + rcu_read_unlock(); return max_bw; |