diff options
author | Daniel Drake <dsd@gentoo.org> | 2006-11-30 19:57:11 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2006-12-05 19:31:32 -0500 |
commit | ff9b99bcccee8449afd23ddc28f8b4b7aec996ea (patch) | |
tree | d2f9916072896e6383f8696c255856853194ad2a /drivers/net/wireless | |
parent | 383956a9c59157db4c404d1c8bb9074b8dfe3ee0 (diff) |
[PATCH] zd1211rw: Fill enc_capa in GIWRANGE handler
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>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/zd1211rw/zd_mac.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c index d7a86b188a99..bd1593e13f8f 100644 --- a/drivers/net/wireless/zd1211rw/zd_mac.c +++ b/drivers/net/wireless/zd1211rw/zd_mac.c | |||
@@ -615,6 +615,9 @@ int zd_mac_get_range(struct zd_mac *mac, struct iw_range *range) | |||
615 | range->we_version_compiled = WIRELESS_EXT; | 615 | range->we_version_compiled = WIRELESS_EXT; |
616 | range->we_version_source = 20; | 616 | range->we_version_source = 20; |
617 | 617 | ||
618 | range->enc_capa = IW_ENC_CAPA_WPA | IW_ENC_CAPA_WPA2 | | ||
619 | IW_ENC_CAPA_CIPHER_TKIP | IW_ENC_CAPA_CIPHER_CCMP; | ||
620 | |||
618 | ZD_ASSERT(!irqs_disabled()); | 621 | ZD_ASSERT(!irqs_disabled()); |
619 | spin_lock_irq(&mac->lock); | 622 | spin_lock_irq(&mac->lock); |
620 | regdomain = mac->regdomain; | 623 | regdomain = mac->regdomain; |