diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2012-03-28 10:58:36 +0200 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2012-04-10 14:54:07 -0400 |
| commit | 24398e39c8ee4a9d9123eed322b859ece4d16cac (patch) | |
| tree | 28e054cd2feaf289bc4fbe279936d2d21ceaba5e /net/mac80211/ht.c | |
| parent | mac80211: use AC constants (diff) | |
| download | linux-dev-24398e39c8ee4a9d9123eed322b859ece4d16cac.tar.xz linux-dev-24398e39c8ee4a9d9123eed322b859ece4d16cac.zip | |
mac80211: set HT channel before association
Changing the channel type during operation is
confusing to some drivers and will be hard to
handle in multi-channel scenarios. Instead of
changing the channel, set it to the right HT
channel before authenticating/associating and
don't change it -- just update the 20/40 MHz
restrictions in rate control as needed when
changed by the AP.
This also fixes a problem that Paul missed in
his fix for the "regulatory makes us deaf"
issue -- when we couldn't use 40 MHz we still
associated saying we were using 40 MHz, which
could in similarly broken APs make us never
even connect successfully.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/ht.c')
| -rw-r--r-- | net/mac80211/ht.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c index f25fff7607d8..9b603366943c 100644 --- a/net/mac80211/ht.c +++ b/net/mac80211/ht.c @@ -19,15 +19,6 @@ #include "ieee80211_i.h" #include "rate.h" -bool ieee80111_cfg_override_disables_ht40(struct ieee80211_sub_if_data *sdata) -{ - const __le16 flg = cpu_to_le16(IEEE80211_HT_CAP_SUP_WIDTH_20_40); - if ((sdata->u.mgd.ht_capa_mask.cap_info & flg) && - !(sdata->u.mgd.ht_capa.cap_info & flg)) - return true; - return false; -} - static void __check_htcap_disable(struct ieee80211_sub_if_data *sdata, struct ieee80211_sta_ht_cap *ht_cap, u16 flag) |