]> err.no Git - linux-2.6/commitdiff
[patch] ipw2100: support WEXT-18 enc_capa v3
authorDan Williams <dcbw@redhat.com>
Mon, 9 Jan 2006 16:04:31 +0000 (11:04 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Mon, 9 Jan 2006 16:04:31 +0000 (11:04 -0500)
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>
drivers/net/wireless/ipw2100.c

index 44cd3fcd15720916d0cf9984a02bc8adb2afcb83..cf05661fb1bda768d037d5eb950ad9a283651ef7 100644 (file)
@@ -7153,7 +7153,7 @@ static int ipw2100_wx_get_range(struct net_device *dev,
 
        /* Set the Wireless Extension versions */
        range->we_version_compiled = WIRELESS_EXT;
-       range->we_version_source = 16;
+       range->we_version_source = 18;
 
 //      range->retry_capa;      /* What retry options are supported */
 //      range->retry_flags;     /* How to decode max/min retry limit */
@@ -7184,6 +7184,9 @@ static int ipw2100_wx_get_range(struct net_device *dev,
                                IW_EVENT_CAPA_MASK(SIOCGIWAP));
        range->event_capa[1] = IW_EVENT_CAPA_K_1;
 
+       range->enc_capa = IW_ENC_CAPA_WPA | IW_ENC_CAPA_WPA2 |
+               IW_ENC_CAPA_CIPHER_TKIP | IW_ENC_CAPA_CIPHER_CCMP;
+
        IPW_DEBUG_WX("GET Range\n");
 
        return 0;