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/work.c | |
| parent | 9bf8ab35f269d66e507de2b1ccc67a02d8284db5 (diff) | |
| download | kernel_goldelico_gta04-8ba0537c620ad9f37b0e810ce0a9ff367a021f5e.zip kernel_goldelico_gta04-8ba0537c620ad9f37b0e810ce0a9ff367a021f5e.tar.gz kernel_goldelico_gta04-8ba0537c620ad9f37b0e810ce0a9ff367a021f5e.tar.bz2 | |
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/work.c')
| -rw-r--r-- | net/mac80211/work.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/net/mac80211/work.c b/net/mac80211/work.c index 64f2b28..204f0a4 100644 --- a/net/mac80211/work.c +++ b/net/mac80211/work.c @@ -126,12 +126,6 @@ static void ieee80211_add_ht_ie(struct sk_buff *skb, const u8 *ht_info_ie, /* determine capability flags */ - if (ieee80211_disable_40mhz_24ghz && - sband->band == IEEE80211_BAND_2GHZ) { - cap &= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40; - cap &= ~IEEE80211_HT_CAP_SGI_40; - } - switch (ht_info->ht_param & IEEE80211_HT_PARAM_CHA_SEC_OFFSET) { case IEEE80211_HT_PARAM_CHA_SEC_ABOVE: if (flags & IEEE80211_CHAN_NO_HT40PLUS) { |