From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mx2.redhat.com ([66.187.237.31]:33702 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754990AbZHJQtc (ORCPT ); Mon, 10 Aug 2009 12:49:32 -0400 Subject: Re: [PATCH] cfg80211: Set WEP ciphers From: Dan Williams To: Samuel Ortiz Cc: "John W. Linville" , "Zhu, Yi" , Johannes Berg , linux-wireless@vger.kernel.org In-Reply-To: <20090810090447.GA5421@sortiz.org> References: <20090806190439.GA22647@sortiz.org> <1249680982.26088.48.camel@localhost.localdomain> <20090810090447.GA5421@sortiz.org> Content-Type: text/plain Date: Mon, 10 Aug 2009 11:49:07 -0500 Message-Id: <1249922947.3722.0.camel@localhost.localdomain> Mime-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org List-ID: On Mon, 2009-08-10 at 11:04 +0200, Samuel Ortiz wrote: > Hi Dan, > > On Fri, Aug 07, 2009 at 04:36:22PM -0500, Dan Williams wrote: > > On Thu, 2009-08-06 at 21:04 +0200, Samuel Ortiz wrote: > > > With iwconfig there is no way to properly set the ciphers when trying to > > > connect to a WEP SSID. Although mac80211 based drivers dont need it, several > > > fullmac drivers do. > > > This patch basically sets the WEP ciphers whenever they're not set at all. > > > > If you're talking about Dynamic WEP, that's what wpa_supplicant is for, > > it will handle setting the ciphers through SIOCSIWENCODEEXT. > No, I'm not talking about dynamic WEP, but rather about "iwconfig wlan0 key > your_static_key". > > > > If you're talking about static WEP, then the ciphers are determined by > > the WEP keys that have been set with iwconfig, and you determine > > WEP40/WEP104 based on the length of the current WEP TX index. > In theory, yes, but our driver's UMAC wants to get the key cipher before > having actually set the keys, and with the latest key handling rework we get > our connect() handler called before keys are actually set. > > > > You should *not* be trying to do Dynamic WEP via iwconfig (which it > > seems is what you're doing below?) > No, that's not what we're trying to do. Thanks for the explanation, sorry for the noise then. Dan > Cheers, > Samuel. > > > > Dan > > > > > Signed-off-by: Samuel Ortiz > > > --- > > > net/wireless/sme.c | 18 ++++++++++++++++-- > > > 1 files changed, 16 insertions(+), 2 deletions(-) > > > > > > diff --git a/net/wireless/sme.c b/net/wireless/sme.c > > > index 8a7dcbf..b78a111 100644 > > > --- a/net/wireless/sme.c > > > +++ b/net/wireless/sme.c > > > @@ -638,14 +638,28 @@ int __cfg80211_connect(struct cfg80211_registered_device *rdev, > > > > > > if (connkeys && connkeys->def >= 0) { > > > int idx; > > > + u32 cipher; > > > > > > idx = connkeys->def; > > > + cipher = connkeys->params[idx].cipher; > > > /* If given a WEP key we may need it for shared key auth */ > > > - if (connkeys->params[idx].cipher == WLAN_CIPHER_SUITE_WEP40 || > > > - connkeys->params[idx].cipher == WLAN_CIPHER_SUITE_WEP104) { > > > + if (cipher == WLAN_CIPHER_SUITE_WEP40 || > > > + cipher == WLAN_CIPHER_SUITE_WEP104) { > > > connect->key_idx = idx; > > > connect->key = connkeys->params[idx].key; > > > connect->key_len = connkeys->params[idx].key_len; > > > + > > > + /* > > > + * If ciphers are not set (e.g. when going through > > > + * iwconfig), we have to set them appropriately here. > > > + */ > > > + if (connect->crypto.cipher_group == 0) > > > + connect->crypto.cipher_group = cipher; > > > + > > > + if (connect->crypto.n_ciphers_pairwise == 0) { > > > + connect->crypto.n_ciphers_pairwise = 1; > > > + connect->crypto.ciphers_pairwise[0] = cipher; > > > + } > > > } > > > } > > > > > > -- > > > 1.6.3.1 > > > > > >