From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail.atheros.com ([12.36.123.2]:25838 "EHLO mail.atheros.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751869AbZF3N1V (ORCPT ); Tue, 30 Jun 2009 09:27:21 -0400 Received: from mail.atheros.com ([10.10.20.108]) by sidewinder.atheros.com for ; Tue, 30 Jun 2009 06:27:25 -0700 Date: Tue, 30 Jun 2009 18:55:48 +0530 From: Vasanthakumar Thiagarajan To: Johannes Berg CC: "linux-wireless@vger.kernel.org" Subject: Re: [PATCH 8/8 v3] mac80211: re-add HT disabling Message-ID: <20090630132547.GB24667@vasanth-laptop> References: <20090630115245.675553951@sipsolutions.net> <20090630115303.111250594@sipsolutions.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" In-Reply-To: <20090630115303.111250594@sipsolutions.net> Sender: linux-wireless-owner@vger.kernel.org List-ID: On Tue, Jun 30, 2009 at 05:22:53PM +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 > --- > net/mac80211/cfg.c | 15 ++++++++++++++- > 1 file changed, 14 insertions(+), 1 deletion(-) > > --- wireless-testing.orig/net/mac80211/cfg.c 2009-06-30 13:25:43.000000000 +0200 > +++ wireless-testing/net/mac80211/cfg.c 2009-06-30 13:25:45.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,19 @@ 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; > + > + if (req->crypto.cipher_group == WLAN_CIPHER_SUITE_WEP40 || > + req->crypto.cipher_group == WLAN_CIPHER_SUITE_TKIP || > + req->crypto.cipher_group == WLAN_CIPHER_SUITE_WEP104) > + sdata->u.mgd.flags |= IEEE80211_STA_TKIP_WEP_USED; No, we have to disable HT only when WEP/TKIP is used as pairwise, not used as group cipher. Vasanth