Author: rpaulo
Date: Thu Jul  4 20:57:15 2013
New Revision: 252725
URL: http://svnweb.freebsd.org/changeset/base/252725

Log:
  Set ic_cryptocaps to make sure wpa_supplicant works with WEP.

Modified:
  head/sys/dev/usb/wlan/if_rum.c
  head/sys/dev/usb/wlan/if_uath.c
  head/sys/dev/usb/wlan/if_upgt.c
  head/sys/dev/usb/wlan/if_ural.c
  head/sys/dev/usb/wlan/if_urtw.c
  head/sys/dev/usb/wlan/if_urtwn.c
  head/sys/dev/usb/wlan/if_zyd.c

Modified: head/sys/dev/usb/wlan/if_rum.c
==============================================================================
--- head/sys/dev/usb/wlan/if_rum.c      Thu Jul  4 20:17:39 2013        
(r252724)
+++ head/sys/dev/usb/wlan/if_rum.c      Thu Jul  4 20:57:15 2013        
(r252725)
@@ -502,6 +502,12 @@ rum_attach(device_t self)
            | IEEE80211_C_WPA           /* 802.11i */
            ;
 
+       ic->ic_cryptocaps =
+           IEEE80211_CRYPTO_WEP |
+           IEEE80211_CRYPTO_AES_CCM |
+           IEEE80211_CRYPTO_TKIPMIC |
+           IEEE80211_CRYPTO_TKIP;
+
        bands = 0;
        setbit(&bands, IEEE80211_MODE_11B);
        setbit(&bands, IEEE80211_MODE_11G);

Modified: head/sys/dev/usb/wlan/if_uath.c
==============================================================================
--- head/sys/dev/usb/wlan/if_uath.c     Thu Jul  4 20:17:39 2013        
(r252724)
+++ head/sys/dev/usb/wlan/if_uath.c     Thu Jul  4 20:57:15 2013        
(r252725)
@@ -457,6 +457,12 @@ uath_attach(device_t dev)
            IEEE80211_C_BGSCAN |        /* capable of bg scanning */
            IEEE80211_C_TXFRAG;         /* handle tx frags */
 
+       ic->ic_cryptocaps =
+           IEEE80211_CRYPTO_WEP |
+           IEEE80211_CRYPTO_AES_CCM |
+           IEEE80211_CRYPTO_TKIPMIC |
+           IEEE80211_CRYPTO_TKIP;
+
        /* put a regulatory domain to reveal informations.  */
        uath_regdomain = sc->sc_devcap.regDomain;
 

Modified: head/sys/dev/usb/wlan/if_upgt.c
==============================================================================
--- head/sys/dev/usb/wlan/if_upgt.c     Thu Jul  4 20:17:39 2013        
(r252724)
+++ head/sys/dev/usb/wlan/if_upgt.c     Thu Jul  4 20:57:15 2013        
(r252725)
@@ -353,6 +353,12 @@ upgt_attach(device_t dev)
                | IEEE80211_C_WPA               /* 802.11i */
                ;
 
+       ic->ic_cryptocaps =
+           IEEE80211_CRYPTO_WEP |
+           IEEE80211_CRYPTO_AES_CCM |
+           IEEE80211_CRYPTO_TKIPMIC |
+           IEEE80211_CRYPTO_TKIP;
+
        bands = 0;
        setbit(&bands, IEEE80211_MODE_11B);
        setbit(&bands, IEEE80211_MODE_11G);

Modified: head/sys/dev/usb/wlan/if_ural.c
==============================================================================
--- head/sys/dev/usb/wlan/if_ural.c     Thu Jul  4 20:17:39 2013        
(r252724)
+++ head/sys/dev/usb/wlan/if_ural.c     Thu Jul  4 20:57:15 2013        
(r252725)
@@ -487,6 +487,12 @@ ural_attach(device_t self)
            | IEEE80211_C_WPA           /* 802.11i */
            ;
 
+       ic->ic_cryptocaps =
+           IEEE80211_CRYPTO_WEP |
+           IEEE80211_CRYPTO_AES_CCM |
+           IEEE80211_CRYPTO_TKIPMIC |
+           IEEE80211_CRYPTO_TKIP;
+
        bands = 0;
        setbit(&bands, IEEE80211_MODE_11B);
        setbit(&bands, IEEE80211_MODE_11G);

Modified: head/sys/dev/usb/wlan/if_urtw.c
==============================================================================
--- head/sys/dev/usb/wlan/if_urtw.c     Thu Jul  4 20:17:39 2013        
(r252724)
+++ head/sys/dev/usb/wlan/if_urtw.c     Thu Jul  4 20:57:15 2013        
(r252725)
@@ -893,6 +893,12 @@ urtw_attach(device_t dev)
            IEEE80211_C_BGSCAN |        /* capable of bg scanning */
            IEEE80211_C_WPA;            /* 802.11i */
 
+       ic->ic_cryptocaps =
+           IEEE80211_CRYPTO_WEP |
+           IEEE80211_CRYPTO_AES_CCM |
+           IEEE80211_CRYPTO_TKIPMIC |
+           IEEE80211_CRYPTO_TKIP;
+
        bands = 0;
        setbit(&bands, IEEE80211_MODE_11B);
        setbit(&bands, IEEE80211_MODE_11G);

Modified: head/sys/dev/usb/wlan/if_urtwn.c
==============================================================================
--- head/sys/dev/usb/wlan/if_urtwn.c    Thu Jul  4 20:17:39 2013        
(r252724)
+++ head/sys/dev/usb/wlan/if_urtwn.c    Thu Jul  4 20:57:15 2013        
(r252725)
@@ -419,6 +419,12 @@ urtwn_attach(device_t self)
                | IEEE80211_C_WPA               /* 802.11i */
                ;
 
+       ic->ic_cryptocaps =
+           IEEE80211_CRYPTO_WEP |
+           IEEE80211_CRYPTO_AES_CCM |
+           IEEE80211_CRYPTO_TKIPMIC |
+           IEEE80211_CRYPTO_TKIP;
+
        bands = 0;
        setbit(&bands, IEEE80211_MODE_11B);
        setbit(&bands, IEEE80211_MODE_11G);

Modified: head/sys/dev/usb/wlan/if_zyd.c
==============================================================================
--- head/sys/dev/usb/wlan/if_zyd.c      Thu Jul  4 20:17:39 2013        
(r252724)
+++ head/sys/dev/usb/wlan/if_zyd.c      Thu Jul  4 20:57:15 2013        
(r252725)
@@ -400,6 +400,12 @@ zyd_attach(device_t dev)
                | IEEE80211_C_WPA               /* 802.11i */
                ;
 
+       ic->ic_cryptocaps =
+           IEEE80211_CRYPTO_WEP |
+           IEEE80211_CRYPTO_AES_CCM |
+           IEEE80211_CRYPTO_TKIPMIC |
+           IEEE80211_CRYPTO_TKIP;
+
        bands = 0;
        setbit(&bands, IEEE80211_MODE_11B);
        setbit(&bands, IEEE80211_MODE_11G);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to