2009-03-02 08:02:33

by Sujith

[permalink] [raw]

Subject: [PATCH] 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 <[email protected]>
---
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

2009-03-08 12:41:48

by Johannes Berg

[permalink] [raw]

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

---

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 <[email protected]>

Acked-by: Johannes Berg <[email protected]>

> ---
> 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);
>

---

Attachments:

signature.asc (836.00 B)
This is a digitally signed message part