cfg80211: set WE encoding size based on available ciphers

Only set the sizes for WEP40 and WEP104.

Signed-off-by: David Kilroy <kilroyd@googlemail.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index bb97061219ca43d2d2ee3a3bd182b5842f0e92e2..2f7e7760bc7e8adcf742ff932ec34bdb11181e40 100644 (file)
--- 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;
@@ -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;
                }
        }