Re: [PATCH] mac80211: Make sure non-HT connection when IEEE80211_STA_TKIP_WEP_USED is set

[Johannes Berg <johannes@sipsolutions.net>]

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

On Wed, 2009-02-11 at 22:18 +0530, Vasanthakumar Thiagarajan wrote:
> It is possible that some broken AP might send HT IEs in it's
> assoc response even though the STA has not sent them in assoc req
> when WEP/TKIP is used as pairwise cipher suite. Also it is important
> to check this bit before enabling ht mode in beacon receive path.
> 
> Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
> ---
>  net/mac80211/mlme.c |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
> index 169f10c..e7aafb0 100644
> --- a/net/mac80211/mlme.c
> +++ b/net/mac80211/mlme.c
> @@ -1532,7 +1532,8 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
>  					 elems.wmm_param_len);
>  
>  	if (elems.ht_info_elem && elems.wmm_param &&
> -	    (ifsta->flags & IEEE80211_STA_WMM_ENABLED))
> +	    (ifsta->flags & IEEE80211_STA_WMM_ENABLED) &&
> +	    !(ifsta->flags & IEEE80211_STA_TKIP_WEP_USED))

Maybe we should have a separate flag for _REQUESTED_HT? I'm thinking
here that possibly we might be adding more conditions under which we do
not request HT?

Otherwise, looks ok to me.

johannes

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