From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-ew0-f176.google.com ([209.85.219.176]:56827 "EHLO mail-ew0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762717AbZE3RhP (ORCPT ); Sat, 30 May 2009 13:37:15 -0400 Received: by mail-ew0-f176.google.com with SMTP id 24so6938274ewy.37 for ; Sat, 30 May 2009 10:37:17 -0700 (PDT) From: David Kilroy To: linux-wireless@vger.kernel.org Cc: orinoco-devel@lists.sourceforge.net, David Kilroy Subject: [RFC v2 04/23] cfg80211: set WE encoding size based on available ciphers Date: Sat, 30 May 2009 18:36:38 +0100 Message-Id: <1243705017-8784-5-git-send-email-kilroyd@googlemail.com> In-Reply-To: <1243705017-8784-1-git-send-email-kilroyd@googlemail.com> References: <1243705017-8784-1-git-send-email-kilroyd@googlemail.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: Only set the sizes for WEP40 and WEP104. Signed-off-by: David Kilroy --- I'm not sure of the intent of the encoding_size field, and whether it should contain entries for TKIP and CCMP ciphers. However since these aren't currently advertised, I've left this alone. --- net/wireless/wext-compat.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c index 9ec9fc5..e5385f0 100644 --- a/net/wireless/wext-compat.c +++ b/net/wireless/wext-compat.c @@ -173,9 +173,6 @@ int cfg80211_wext_giwrange(struct net_device *dev, range->min_frag = 256; range->max_frag = 2346; - range->encoding_size[0] = 5; - range->encoding_size[1] = 13; - range->num_encoding_sizes = 2; range->max_encoding_tokens = 4; range->max_qual.updated = IW_QUAL_NOISE_INVALID; @@ -213,6 +210,12 @@ int cfg80211_wext_giwrange(struct net_device *dev, range->enc_capa |= IW_ENC_CAPA_CIPHER_TKIP; else if (suite == WLAN_CIPHER_SUITE_CCMP) range->enc_capa |= IW_ENC_CAPA_CIPHER_CCMP; + else if (suite == WLAN_CIPHER_SUITE_WEP40) + range->encoding_size[range->num_encoding_sizes++] = + WLAN_KEY_LEN_WEP40; + else if (suite == WLAN_CIPHER_SUITE_WEP104) + range->encoding_size[range->num_encoding_sizes++] = + WLAN_KEY_LEN_WEP104; } for (band = 0; band < IEEE80211_NUM_BANDS; band ++) { -- 1.6.0.6