From 46d687b3dcba1730be94bc1775582fa6cf9249dc Mon Sep 17 00:00:00 2001 From: David Kilroy Date: Thu, 18 Jun 2009 23:21:16 +0100 Subject: [PATCH] --- yaml --- r: 158843 b: refs/heads/master c: 2ab658f9ce218ae93b3d2db2b3fe68bfefb81196 h: refs/heads/master i: 158841: fbe9f0c035c01b915e300c7e9e23b1f188dae011 158839: 23ac478995e72a590ceb4ed3206947223ab13163 v: v3 --- [refs] | 2 +- trunk/net/wireless/wext-compat.c | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7ad341d993ed..68d7258ebbe9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 51cd4aabd082144881644c308647ca501690b68c +refs/heads/master: 2ab658f9ce218ae93b3d2db2b3fe68bfefb81196 diff --git a/trunk/net/wireless/wext-compat.c b/trunk/net/wireless/wext-compat.c index bb97061219ca..2f7e7760bc7e 100644 --- a/trunk/net/wireless/wext-compat.c +++ b/trunk/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; @@ -215,6 +212,16 @@ int cfg80211_wext_giwrange(struct net_device *dev, case WLAN_CIPHER_SUITE_CCMP: range->enc_capa |= IW_ENC_CAPA_CIPHER_CCMP; break; + + case WLAN_CIPHER_SUITE_WEP40: + range->encoding_size[range->num_encoding_sizes++] = + WLAN_KEY_LEN_WEP40; + break; + + case WLAN_CIPHER_SUITE_WEP104: + range->encoding_size[range->num_encoding_sizes++] = + WLAN_KEY_LEN_WEP104; + break; } }