Author: rpaulo
Date: Sun Jul 14 18:26:47 2013
New Revision: 253340
URL: http://svnweb.freebsd.org/changeset/base/253340
Log:
Revert r252725 as it breaks WPA.
We need to fix wpa_supplicant because it checks whether the card has
ic_cryptocaps set. Since net80211 can do software encryption this check in
wpa_supplicant is wrong.
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 Sun Jul 14 10:22:00 2013
(r253339)
+++ head/sys/dev/usb/wlan/if_rum.c Sun Jul 14 18:26:47 2013
(r253340)
@@ -502,12 +502,6 @@ 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 Sun Jul 14 10:22:00 2013
(r253339)
+++ head/sys/dev/usb/wlan/if_uath.c Sun Jul 14 18:26:47 2013
(r253340)
@@ -457,12 +457,6 @@ 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 Sun Jul 14 10:22:00 2013
(r253339)
+++ head/sys/dev/usb/wlan/if_upgt.c Sun Jul 14 18:26:47 2013
(r253340)
@@ -353,12 +353,6 @@ 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 Sun Jul 14 10:22:00 2013
(r253339)
+++ head/sys/dev/usb/wlan/if_ural.c Sun Jul 14 18:26:47 2013
(r253340)
@@ -487,12 +487,6 @@ 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 Sun Jul 14 10:22:00 2013
(r253339)
+++ head/sys/dev/usb/wlan/if_urtw.c Sun Jul 14 18:26:47 2013
(r253340)
@@ -893,12 +893,6 @@ 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 Sun Jul 14 10:22:00 2013
(r253339)
+++ head/sys/dev/usb/wlan/if_urtwn.c Sun Jul 14 18:26:47 2013
(r253340)
@@ -419,12 +419,6 @@ 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 Sun Jul 14 10:22:00 2013
(r253339)
+++ head/sys/dev/usb/wlan/if_zyd.c Sun Jul 14 18:26:47 2013
(r253340)
@@ -400,12 +400,6 @@ 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-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
