aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/mlme.c
diff options
context:
space:
mode:
authorSujith <Sujith.Manoharan@atheros.com>2009-03-02 02:58:31 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-03-05 14:39:37 -0500
commite65c22633c14eabe9593a71a727f81544378b892 (patch)
tree1a1420fada5325d0838bf1f63a5882133454018d /net/mac80211/mlme.c
parenta412c8040d83366dcc24962207b8beed52f29344 (diff)
mac80211: Fix TKIP/WEP HT capability handling
There is no need to parse the AP's HT capabilities if the STA uses TKIP/WEP cipher. This allows the rate control module to choose the correct(legacy) rate table. Signed-off-by: Sujith <Sujith.Manoharan@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r--net/mac80211/mlme.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 7f238589b6ff..52d876e3eabe 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1307,7 +1307,8 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
1307 else 1307 else
1308 sdata->flags &= ~IEEE80211_SDATA_OPERATING_GMODE; 1308 sdata->flags &= ~IEEE80211_SDATA_OPERATING_GMODE;
1309 1309
1310 if (elems.ht_cap_elem) 1310 /* If TKIP/WEP is used, no need to parse AP's HT capabilities */
1311 if (elems.ht_cap_elem && !(ifmgd->flags & IEEE80211_STA_TKIP_WEP_USED))
1311 ieee80211_ht_cap_ie_to_sta_ht_cap(sband, 1312 ieee80211_ht_cap_ie_to_sta_ht_cap(sband,
1312 elems.ht_cap_elem, &sta->sta.ht_cap); 1313 elems.ht_cap_elem, &sta->sta.ht_cap);
1313 1314