]> err.no Git - linux-2.6/commitdiff
[PATCH] zd1211rw: Fill enc_capa in GIWRANGE handler
authorDaniel Drake <dsd@gentoo.org>
Fri, 1 Dec 2006 00:57:11 +0000 (00:57 +0000)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 6 Dec 2006 00:31:32 +0000 (19:31 -0500)
This is needed for NetworkManager users to connect to WPA networks.
Pointed out by Matthew Campbell.

Signed-off-by: Daniel Drake <dsd@gentoo.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/zd1211rw/zd_mac.c

index d7a86b188a9989315126baa17d844c3bc8c4a8d3..bd1593e13f8f41c45740f6aeb7b8cde3c1f32eab 100644 (file)
@@ -615,6 +615,9 @@ int zd_mac_get_range(struct zd_mac *mac, struct iw_range *range)
        range->we_version_compiled = WIRELESS_EXT;
        range->we_version_source = 20;
 
+       range->enc_capa = IW_ENC_CAPA_WPA |  IW_ENC_CAPA_WPA2 |
+                         IW_ENC_CAPA_CIPHER_TKIP | IW_ENC_CAPA_CIPHER_CCMP;
+
        ZD_ASSERT(!irqs_disabled());
        spin_lock_irq(&mac->lock);
        regdomain = mac->regdomain;