Re: [PATCH 8/8 v3.1] mac80211: re-add HT disabling

[Johannes Berg <johannes@sipsolutions.net>]

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

On Wed, 2009-07-01 at 15:43 +0530, Vasanthakumar Thiagarajan wrote:
> On Wed, Jul 01, 2009 at 01:09:16PM +0530, Johannes Berg wrote:
> > The IEEE80211_STA_TKIP_WEP_USED flag is used internally to
> > disable HT when WEP or TKIP are used. Now that cfg80211 is
> > giving us the required information, we can set the flag
> > appropriately again.
> > 
> > Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
> > ---
> >  net/mac80211/cfg.c |   10 +++++++++-
> >  1 file changed, 9 insertions(+), 1 deletion(-)
> > 
> > --- wireless-testing.orig/net/mac80211/cfg.c    2009-07-01 09:01:25.000000000 +0200
> > +++ wireless-testing/net/mac80211/cfg.c 2009-07-01 09:09:01.000000000 +0200
> > @@ -1228,7 +1228,7 @@ static int ieee80211_assoc(struct wiphy
> >                            struct cfg80211_assoc_request *req)
> >  {
> >         struct ieee80211_sub_if_data *sdata;
> > -       int ret;
> > +       int ret, i;
> > 
> >         sdata = IEEE80211_DEV_TO_SUB_IF(dev);
> > 
> > @@ -1236,6 +1236,14 @@ static int ieee80211_assoc(struct wiphy
> >             !(sdata->u.mgd.flags & IEEE80211_STA_AUTHENTICATED))
> >                 return -ENOLINK; /* not authenticated */
> > 
> > +       sdata->u.mgd.flags &= ~IEEE80211_STA_TKIP_WEP_USED;
> > +
> > +       for (i = 0; i < req->crypto.n_ciphers_pairwise; i++)
> > +               if (req->crypto.ciphers_pairwise[i] == WLAN_CIPHER_SUITE_WEP40 ||
> > +                   req->crypto.ciphers_pairwise[i] == WLAN_CIPHER_SUITE_TKIP ||
> > +                   req->crypto.ciphers_pairwise[i] == WLAN_CIPHER_SUITE_WEP104)
> > +                       sdata->u.mgd.flags |= IEEE80211_STA_TKIP_WEP_USED;
> > +
> 
> for..loop does not seem to be necessary here as it is very unlikely that
> an assoc req will have more than one cipher suite.

True, but so far we've defined the API that way. Should we redefine the
API? I keep forgetting what is valid where. Jouni?

> I'm not sure if this patch series will get into 2.6.31-rc, if it
> does not, we may need a variant of this patch to fix
> http://bugzilla.kernel.org/show_bug.cgi?id=13630, I'll work on it.
> Thanks!.

I don't think we can. Even the above patch relies on wpa_supplicant to
pass us the correct information. Otherwise we would have to parse the
IEs, which is somewhat ugly.

johannes

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