mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-07 00:50:50 +00:00
wpa: Remove the now not-needed local logic to hard-code cipher support
A previous commit now exposes the supported net80211 ciphers for the given NIC, rather than the hardware cipher list. This is going to be especially important moving forward when we add more cipher and key management support. Differential Revision: https://reviews.freebsd.org/D44821
This commit is contained in:
parent
1116e8b95c
commit
491938d743
|
@ -1557,17 +1557,6 @@ static int wpa_driver_bsd_capa(struct bsd_driver_data *drv)
|
|||
if (devcaps.dc_drivercaps & IEEE80211_C_WPA2)
|
||||
drv->capa.key_mgmt = WPA_DRIVER_CAPA_KEY_MGMT_WPA2 |
|
||||
WPA_DRIVER_CAPA_KEY_MGMT_WPA2_PSK;
|
||||
#ifdef __FreeBSD__
|
||||
drv->capa.enc |= WPA_DRIVER_CAPA_ENC_WEP40 |
|
||||
WPA_DRIVER_CAPA_ENC_WEP104 |
|
||||
WPA_DRIVER_CAPA_ENC_TKIP |
|
||||
WPA_DRIVER_CAPA_ENC_CCMP;
|
||||
#else
|
||||
/*
|
||||
* XXX
|
||||
* FreeBSD exports hardware cryptocaps. These have no meaning for wpa
|
||||
* since net80211 performs software crypto.
|
||||
*/
|
||||
|
||||
if (devcaps.dc_cryptocaps & IEEE80211_CRYPTO_WEP)
|
||||
drv->capa.enc |= WPA_DRIVER_CAPA_ENC_WEP40 |
|
||||
|
@ -1576,7 +1565,6 @@ static int wpa_driver_bsd_capa(struct bsd_driver_data *drv)
|
|||
drv->capa.enc |= WPA_DRIVER_CAPA_ENC_TKIP;
|
||||
if (devcaps.dc_cryptocaps & IEEE80211_CRYPTO_AES_CCM)
|
||||
drv->capa.enc |= WPA_DRIVER_CAPA_ENC_CCMP;
|
||||
#endif
|
||||
|
||||
if (devcaps.dc_drivercaps & IEEE80211_C_HOSTAP)
|
||||
drv->capa.flags |= WPA_DRIVER_FLAGS_AP;
|
||||
|
|
Loading…
Reference in a new issue