[PATCH] mac80211: Fix TKIP/WEP HT capability handling

[PATCH] mac80211: Fix TKIP/WEP HT capability handling

[Sujith]

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>
---
 net/mac80211/mlme.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 7f23858..52d876e 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,
 	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);
 
-- 
1.6.1

Re: [PATCH] mac80211: Fix TKIP/WEP HT capability handling

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 1033 bytes --]

On Mon, 2009-03-02 at 13:28 +0530, Sujith wrote:
> 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>

Acked-by: Johannes Berg <johannes@sipsolutions.net>

> ---
>  net/mac80211/mlme.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
> index 7f23858..52d876e 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,
>  	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);
>  

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]