diff options
| author | rpaulo <rpaulo@FreeBSD.org> | 2013-07-14 18:26:47 +0000 |
|---|---|---|
| committer | rpaulo <rpaulo@FreeBSD.org> | 2013-07-14 18:26:47 +0000 |
| commit | 80bd92a170a5645f7796369a96b56e91fd0edc83 (patch) | |
| tree | 43ff892cf68a6dca7ce559d452bae1f33ac9cbba | |
| parent | 9ea6fe9fbe3f7fe6bb134bf6e50b6678662f4075 (diff) | |
| download | FreeBSD-src-80bd92a170a5645f7796369a96b56e91fd0edc83.zip FreeBSD-src-80bd92a170a5645f7796369a96b56e91fd0edc83.tar.gz | |
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.
| -rw-r--r-- | sys/dev/usb/wlan/if_rum.c | 6 | ||||
| -rw-r--r-- | sys/dev/usb/wlan/if_uath.c | 6 | ||||
| -rw-r--r-- | sys/dev/usb/wlan/if_upgt.c | 6 | ||||
| -rw-r--r-- | sys/dev/usb/wlan/if_ural.c | 6 | ||||
| -rw-r--r-- | sys/dev/usb/wlan/if_urtw.c | 6 | ||||
| -rw-r--r-- | sys/dev/usb/wlan/if_urtwn.c | 6 | ||||
| -rw-r--r-- | sys/dev/usb/wlan/if_zyd.c | 6 |
7 files changed, 0 insertions, 42 deletions
diff --git a/sys/dev/usb/wlan/if_rum.c b/sys/dev/usb/wlan/if_rum.c index 1d17ceb..fa4e9f1 100644 --- a/sys/dev/usb/wlan/if_rum.c +++ b/sys/dev/usb/wlan/if_rum.c @@ -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); diff --git a/sys/dev/usb/wlan/if_uath.c b/sys/dev/usb/wlan/if_uath.c index 76bd02b..f238d0d 100644 --- a/sys/dev/usb/wlan/if_uath.c +++ b/sys/dev/usb/wlan/if_uath.c @@ -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; diff --git a/sys/dev/usb/wlan/if_upgt.c b/sys/dev/usb/wlan/if_upgt.c index fb4d619..eff7922 100644 --- a/sys/dev/usb/wlan/if_upgt.c +++ b/sys/dev/usb/wlan/if_upgt.c @@ -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); diff --git a/sys/dev/usb/wlan/if_ural.c b/sys/dev/usb/wlan/if_ural.c index 0815452..f3fa1ca 100644 --- a/sys/dev/usb/wlan/if_ural.c +++ b/sys/dev/usb/wlan/if_ural.c @@ -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); diff --git a/sys/dev/usb/wlan/if_urtw.c b/sys/dev/usb/wlan/if_urtw.c index 10fd7db..184317b 100644 --- a/sys/dev/usb/wlan/if_urtw.c +++ b/sys/dev/usb/wlan/if_urtw.c @@ -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); diff --git a/sys/dev/usb/wlan/if_urtwn.c b/sys/dev/usb/wlan/if_urtwn.c index c243af5..5f61cde 100644 --- a/sys/dev/usb/wlan/if_urtwn.c +++ b/sys/dev/usb/wlan/if_urtwn.c @@ -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); diff --git a/sys/dev/usb/wlan/if_zyd.c b/sys/dev/usb/wlan/if_zyd.c index d245d99..3d3f269 100644 --- a/sys/dev/usb/wlan/if_zyd.c +++ b/sys/dev/usb/wlan/if_zyd.c @@ -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); |
