diff options
author | Dan Williams <dcbw@redhat.com> | 2006-01-30 13:58:56 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2006-01-30 20:35:35 -0500 |
commit | f1b50863aa6a96c61a57e3b3a5e76e67b38c5c3e (patch) | |
tree | 9582287de5d5c9cf42a120e4103e2c6b849a2992 /drivers/net/wireless/ipw2200.c | |
parent | 4be757dd4c00ddabff2d6faf639466bb5d76bc79 (diff) |
[PATCH] wireless/ipw2200: support WE-18 WPA enc_capa
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: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ipw2200.c')
-rw-r--r-- | drivers/net/wireless/ipw2200.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c index 18e00fe8a218..734d2cb1de06 100644 --- a/drivers/net/wireless/ipw2200.c +++ b/drivers/net/wireless/ipw2200.c | |||
@@ -8392,7 +8392,7 @@ static int ipw_wx_get_range(struct net_device *dev, | |||
8392 | 8392 | ||
8393 | /* Set the Wireless Extension versions */ | 8393 | /* Set the Wireless Extension versions */ |
8394 | range->we_version_compiled = WIRELESS_EXT; | 8394 | range->we_version_compiled = WIRELESS_EXT; |
8395 | range->we_version_source = 16; | 8395 | range->we_version_source = 18; |
8396 | 8396 | ||
8397 | i = 0; | 8397 | i = 0; |
8398 | if (priv->ieee->mode & (IEEE_B | IEEE_G)) { | 8398 | if (priv->ieee->mode & (IEEE_B | IEEE_G)) { |
@@ -8424,6 +8424,9 @@ static int ipw_wx_get_range(struct net_device *dev, | |||
8424 | IW_EVENT_CAPA_MASK(SIOCGIWAP)); | 8424 | IW_EVENT_CAPA_MASK(SIOCGIWAP)); |
8425 | range->event_capa[1] = IW_EVENT_CAPA_K_1; | 8425 | range->event_capa[1] = IW_EVENT_CAPA_K_1; |
8426 | 8426 | ||
8427 | range->enc_capa = IW_ENC_CAPA_WPA | IW_ENC_CAPA_WPA2 | | ||
8428 | IW_ENC_CAPA_CIPHER_TKIP | IW_ENC_CAPA_CIPHER_CCMP; | ||
8429 | |||
8427 | IPW_DEBUG_WX("GET Range\n"); | 8430 | IPW_DEBUG_WX("GET Range\n"); |
8428 | return 0; | 8431 | return 0; |
8429 | } | 8432 | } |