* [PATCH] mac80211: Make sure non-HT connection when IEEE80211_STA_TKIP_WEP_USED is set
@ 2009-02-11 16:48 Vasanthakumar Thiagarajan
2009-02-11 16:57 ` Johannes Berg
0 siblings, 1 reply; 4+ messages in thread
From: Vasanthakumar Thiagarajan @ 2009-02-11 16:48 UTC (permalink / raw)
To: linville, johannes; +Cc: linux-wireless
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))
changed |= ieee80211_enable_ht(sdata, elems.ht_info_elem,
ap_ht_cap_flags);
@@ -1933,7 +1934,8 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
erp_valid, erp_value);
- if (elems.ht_cap_elem && elems.ht_info_elem && elems.wmm_param) {
+ if (elems.ht_cap_elem && elems.ht_info_elem && elems.wmm_param &&
+ !(ifsta->flags & IEEE80211_STA_TKIP_WEP_USED)) {
struct sta_info *sta;
struct ieee80211_supported_band *sband;
u16 ap_ht_cap_flags;
--
1.5.5.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] mac80211: Make sure non-HT connection when IEEE80211_STA_TKIP_WEP_USED is set
2009-02-11 16:48 [PATCH] mac80211: Make sure non-HT connection when IEEE80211_STA_TKIP_WEP_USED is set Vasanthakumar Thiagarajan
@ 2009-02-11 16:57 ` Johannes Berg
2009-02-11 18:04 ` Vasanthakumar Thiagarajan
0 siblings, 1 reply; 4+ messages in thread
From: Johannes Berg @ 2009-02-11 16:57 UTC (permalink / raw)
To: Vasanthakumar Thiagarajan; +Cc: linville, linux-wireless
[-- 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 --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] mac80211: Make sure non-HT connection when IEEE80211_STA_TKIP_WEP_USED is set
2009-02-11 16:57 ` Johannes Berg
@ 2009-02-11 18:04 ` Vasanthakumar Thiagarajan
2009-02-11 18:20 ` Johannes Berg
0 siblings, 1 reply; 4+ messages in thread
From: Vasanthakumar Thiagarajan @ 2009-02-11 18:04 UTC (permalink / raw)
To: Johannes Berg
Cc: Vasanth Thiagarajan, linville@tuxdriver.com,
linux-wireless@vger.kernel.org
On Wed, Feb 11, 2009 at 10:27:44PM +0530, Johannes Berg wrote:
> 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.
That's right. We can even remove IEEE80211_STA_TKIP_WEP_USED if we
introduce a generic flag to enable ht, but this cleanup can be in a
separate patch. Thanks for the comments.
Vasanth
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] mac80211: Make sure non-HT connection when IEEE80211_STA_TKIP_WEP_USED is set
2009-02-11 18:04 ` Vasanthakumar Thiagarajan
@ 2009-02-11 18:20 ` Johannes Berg
0 siblings, 0 replies; 4+ messages in thread
From: Johannes Berg @ 2009-02-11 18:20 UTC (permalink / raw)
To: Vasanthakumar Thiagarajan
Cc: Vasanth Thiagarajan, linville@tuxdriver.com,
linux-wireless@vger.kernel.org
[-- Attachment #1: Type: text/plain, Size: 1759 bytes --]
On Wed, 2009-02-11 at 23:34 +0530, Vasanthakumar Thiagarajan wrote:
> On Wed, Feb 11, 2009 at 10:27:44PM +0530, Johannes Berg wrote:
> > 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.
>
> That's right. We can even remove IEEE80211_STA_TKIP_WEP_USED if we
> introduce a generic flag to enable ht, but this cleanup can be in a
> separate patch. Thanks for the comments.
Good point, if we identify another reason to disable HT later then we
can just rename this flag.
johannes
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-02-11 18:21 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-02-11 16:48 [PATCH] mac80211: Make sure non-HT connection when IEEE80211_STA_TKIP_WEP_USED is set Vasanthakumar Thiagarajan
2009-02-11 16:57 ` Johannes Berg
2009-02-11 18:04 ` Vasanthakumar Thiagarajan
2009-02-11 18:20 ` Johannes Berg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox