Signed-off-by: David Kilroy <kilroyd@xxxxxxxxxxxxxx>
---
Not sure if this is how we want to detect WPA/WPA2 capability, but from
what I've read this is valid. An alternative would be to add a
capabilities flag to struct wiphy.
---
net/wireless/wext-compat.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index e5385f0..f090737 100644
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -201,15 +201,15 @@ int cfg80211_wext_giwrange(struct net_device *dev,
range->avg_qual.noise = range->max_qual.noise / 2;
range->avg_qual.updated = range->max_qual.updated;
- range->enc_capa = IW_ENC_CAPA_WPA | IW_ENC_CAPA_WPA2;
-
for (c = 0; c < wdev->wiphy->n_cipher_suites; c++) {
u32 suite = wdev->wiphy->cipher_suites[c];
if (suite == WLAN_CIPHER_SUITE_TKIP)
- range->enc_capa |= IW_ENC_CAPA_CIPHER_TKIP;
+ range->enc_capa |= (IW_ENC_CAPA_CIPHER_TKIP |
+ IW_ENC_CAPA_WPA);
else if (suite == WLAN_CIPHER_SUITE_CCMP)
- range->enc_capa |= IW_ENC_CAPA_CIPHER_CCMP;
+ range->enc_capa |= (IW_ENC_CAPA_CIPHER_CCMP |
+ IW_ENC_CAPA_WPA2);
else if (suite == WLAN_CIPHER_SUITE_WEP40)
range->encoding_size[range->num_encoding_sizes++] =
WLAN_KEY_LEN_WEP40;
--
1.6.0.6
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
