mac80211: fix 2.4 GHz 40 MHz disabling
authorJohannes Berg <johannes.berg@intel.com>
Wed, 16 Feb 2011 07:46:58 +0000 (08:46 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 18 Feb 2011 21:54:52 +0000 (16:54 -0500)
commit8ba0537c620ad9f37b0e810ce0a9ff367a021f5e
tree659622a8cd43642ca6438ec6a7a3e68e82d23efd
parent9bf8ab35f269d66e507de2b1ccc67a02d8284db5
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>
net/mac80211/ieee80211_i.h
net/mac80211/main.c
net/mac80211/util.c
net/mac80211/work.c