diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2011-02-16 08:46:58 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-02-18 16:54:52 -0500 |
| commit | 8ba0537c620ad9f37b0e810ce0a9ff367a021f5e (patch) | |
| tree | 659622a8cd43642ca6438ec6a7a3e68e82d23efd /net/mac80211/util.c | |
| parent | 9bf8ab35f269d66e507de2b1ccc67a02d8284db5 (diff) | |
| download | op-kernel-dev-8ba0537c620ad9f37b0e810ce0a9ff367a021f5e.zip op-kernel-dev-8ba0537c620ad9f37b0e810ce0a9ff367a021f5e.tar.gz | |
mac80211: fix 2.4 GHz 40 MHz disabling
The module parameter ieee80211_disable_40mhz_24ghz
was meant to allow disabling 40 MHz operation in
the 2.4 GHz band by default. However, it is buggy
as implemented because while it advertises to the
AP that the device doesn't support 40 MHz, it will
itself still use 40 MHz configurations.
To fix this, clear the 40 MHz bits from the sband
completely instead of overriding where used.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/util.c')
| -rw-r--r-- | net/mac80211/util.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index cf68700..26fd5d2 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -986,12 +986,6 @@ int ieee80211_build_preq_ies(struct ieee80211_local *local, u8 *buffer, u16 cap = sband->ht_cap.cap; __le16 tmp; - if (ieee80211_disable_40mhz_24ghz && - sband->band == IEEE80211_BAND_2GHZ) { - cap &= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40; - cap &= ~IEEE80211_HT_CAP_SGI_40; - } - *pos++ = WLAN_EID_HT_CAPABILITY; *pos++ = sizeof(struct ieee80211_ht_cap); memset(pos, 0, sizeof(struct ieee80211_ht_cap)); |
