diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-08-16 20:24:51 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-08-16 20:24:51 +0200 |
| commit | d0746663667f37e7be5646bf68cb452c8375a23d (patch) | |
| tree | 85ae5a3d5e5bae53815baba5dba372e4d53a9745 /net/mac80211/mlme.c | |
| parent | rt2x00: rt2800pci: fix AUX_CTRL register setup for RT3090/3390/3593/5592 (diff) | |
| parent | mac80211: add APIs to allow keeping connections after WoWLAN (diff) | |
| download | linux-d0746663667f37e7be5646bf68cb452c8375a23d.tar.xz linux-d0746663667f37e7be5646bf68cb452c8375a23d.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'net/mac80211/mlme.c')
| -rw-r--r-- | net/mac80211/mlme.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 21bccd849b3f..2aab1308690f 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -1113,6 +1113,15 @@ ieee80211_sta_process_chanswitch(struct ieee80211_sub_if_data *sdata, case -1: cfg80211_chandef_create(&new_chandef, new_chan, NL80211_CHAN_NO_HT); + /* keep width for 5/10 MHz channels */ + switch (sdata->vif.bss_conf.chandef.width) { + case NL80211_CHAN_WIDTH_5: + case NL80211_CHAN_WIDTH_10: + new_chandef.width = sdata->vif.bss_conf.chandef.width; + break; + default: + break; + } break; } |