From 1ff308ce8e45584f410a890fba1d53eeeccd489a Mon Sep 17 00:00:00 2001 From: Sujith Date: Mon, 2 Mar 2009 13:28:31 +0530 Subject: [PATCH] --- yaml --- r: 135078 b: refs/heads/master c: e65c22633c14eabe9593a71a727f81544378b892 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/mac80211/mlme.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0fe1575ff155..f310b0bf0227 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a412c8040d83366dcc24962207b8beed52f29344 +refs/heads/master: e65c22633c14eabe9593a71a727f81544378b892 diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c index 7f238589b6ff..52d876e3eabe 100644 --- a/trunk/net/mac80211/mlme.c +++ b/trunk/net/mac80211/mlme.c @@ -1307,7 +1307,8 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata, else sdata->flags &= ~IEEE80211_SDATA_OPERATING_GMODE; - if (elems.ht_cap_elem) + /* If TKIP/WEP is used, no need to parse AP's HT capabilities */ + if (elems.ht_cap_elem && !(ifmgd->flags & IEEE80211_STA_TKIP_WEP_USED)) ieee80211_ht_cap_ie_to_sta_ht_cap(sband, elems.ht_cap_elem, &sta->sta.ht_cap);