git: 491938d7435f - main - wpa: Remove the now not-needed local logic to hard-code cipher support

The branch main has been updated by adrian:

URL: https://cgit.FreeBSD.org/src/commit/?id=491938d7435f6a1ee7b6e5a669a72e4c12bd7d2b

commit 491938d7435f6a1ee7b6e5a669a72e4c12bd7d2b
Author:     Adrian Chadd <adrian@FreeBSD.org>
AuthorDate: 2024-04-17 01:55:28 +0000
Commit:     Adrian Chadd <adrian@FreeBSD.org>
CommitDate: 2024-05-09 00:48:58 +0000

    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
---
 contrib/wpa/src/drivers/driver_bsd.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/contrib/wpa/src/drivers/driver_bsd.c b/contrib/wpa/src/drivers/driver_bsd.c
index d5ff51cee456..14c19eb1246c 100644
--- a/contrib/wpa/src/drivers/driver_bsd.c
+++ b/contrib/wpa/src/drivers/driver_bsd.c
@@ -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;