diff options
author | Dan Williams <dcbw@redhat.com> | 2006-01-09 11:04:31 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-09 11:04:31 -0500 |
commit | 166c3436d683cfe5316c7723ed746a93db053f12 (patch) | |
tree | bb7a72a938b3a9db6a6b04032125ae6a765c0e60 /drivers/net/wireless/ipw2100.c | |
parent | 64916f1ebe93592153c72bcdb189a31e4d40049a (diff) |
[patch] ipw2100: support WEXT-18 enc_capa v3
This patch allows ipw2100 driver to advertise the WPA-related encryption
options that it does really support. It's necessary to work correctly
with NetworkManager and other programs that actually check driver & card
capabilities.
Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net/wireless/ipw2100.c')
-rw-r--r-- | drivers/net/wireless/ipw2100.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c index 44cd3fcd1572..cf05661fb1bd 100644 --- a/drivers/net/wireless/ipw2100.c +++ b/drivers/net/wireless/ipw2100.c | |||
@@ -7153,7 +7153,7 @@ static int ipw2100_wx_get_range(struct net_device *dev, | |||
7153 | 7153 | ||
7154 | /* Set the Wireless Extension versions */ | 7154 | /* Set the Wireless Extension versions */ |
7155 | range->we_version_compiled = WIRELESS_EXT; | 7155 | range->we_version_compiled = WIRELESS_EXT; |
7156 | range->we_version_source = 16; | 7156 | range->we_version_source = 18; |
7157 | 7157 | ||
7158 | // range->retry_capa; /* What retry options are supported */ | 7158 | // range->retry_capa; /* What retry options are supported */ |
7159 | // range->retry_flags; /* How to decode max/min retry limit */ | 7159 | // range->retry_flags; /* How to decode max/min retry limit */ |
@@ -7184,6 +7184,9 @@ static int ipw2100_wx_get_range(struct net_device *dev, | |||
7184 | IW_EVENT_CAPA_MASK(SIOCGIWAP)); | 7184 | IW_EVENT_CAPA_MASK(SIOCGIWAP)); |
7185 | range->event_capa[1] = IW_EVENT_CAPA_K_1; | 7185 | range->event_capa[1] = IW_EVENT_CAPA_K_1; |
7186 | 7186 | ||
7187 | range->enc_capa = IW_ENC_CAPA_WPA | IW_ENC_CAPA_WPA2 | | ||
7188 | IW_ENC_CAPA_CIPHER_TKIP | IW_ENC_CAPA_CIPHER_CCMP; | ||
7189 | |||
7187 | IPW_DEBUG_WX("GET Range\n"); | 7190 | IPW_DEBUG_WX("GET Range\n"); |
7188 | 7191 | ||
7189 | return 0; | 7192 | return 0; |