UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ath9k_hw: remove ATH9K_CAP_CIPHER 

All of the ciphers that are tested for are always supported

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Felix Fietkau 2010-06-12 17:22:28 +02:00 committed by John W. Linville
parent 0efabd5123
commit 716f7fc5b8
4 changed files with 16 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/net/wireless/ath/ath9k/htc_drv_init.c
View File

@ -570,16 +570,13 @@ static void ath9k_init_crypto(struct ath9k_htc_priv *priv)
for (i = 0; i < common->keymax; i++) for (i = 0; i < common->keymax; i++)
ath9k_hw_keyreset(priv->ah, (u16) i); ath9k_hw_keyreset(priv->ah, (u16) i);
if (ath9k_hw_getcapability(priv->ah, ATH9K_CAP_CIPHER, /*
ATH9K_CIPHER_TKIP, NULL)) { * Whether we should enable h/w TKIP MIC.
/* * XXX: if we don't support WME TKIP MIC, then we wouldn't
* Whether we should enable h/w TKIP MIC. * report WMM capable, so it's always safe to turn on
* XXX: if we don't support WME TKIP MIC, then we wouldn't * TKIP MIC in this case.
* report WMM capable, so it's always safe to turn on */
* TKIP MIC in this case. ath9k_hw_setcapability(priv->ah, ATH9K_CAP_TKIP_MIC, 0, 1, NULL);
*/
ath9k_hw_setcapability(priv->ah, ATH9K_CAP_TKIP_MIC, 0, 1, NULL);
}
/* /*
* Check whether the separate key cache entries * Check whether the separate key cache entries
@ -587,12 +584,7 @@ static void ath9k_init_crypto(struct ath9k_htc_priv *priv)
* With split mic keys the number of stations is limited * With split mic keys the number of stations is limited
* to 27 otherwise 59. * to 27 otherwise 59.
*/ */
if (ath9k_hw_getcapability(priv->ah, ATH9K_CAP_CIPHER, if (ath9k_hw_getcapability(priv->ah, ATH9K_CAP_TKIP_SPLIT, 0, NULL))
ATH9K_CIPHER_TKIP, NULL)
&& ath9k_hw_getcapability(priv->ah, ATH9K_CAP_CIPHER,
ATH9K_CIPHER_MIC, NULL)
&& ath9k_hw_getcapability(priv->ah, ATH9K_CAP_TKIP_SPLIT,
0, NULL))
common->splitmic = 1; common->splitmic = 1;
/* turn on mcast key search if possible */ /* turn on mcast key search if possible */

12
drivers/net/wireless/ath/ath9k/hw.c
View File

@ -2260,18 +2260,6 @@ bool ath9k_hw_getcapability(struct ath_hw *ah, enum ath9k_capability_type type,
{ {
struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah); struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah);
switch (type) { switch (type) {
case ATH9K_CAP_CIPHER:
switch (capability) {
case ATH9K_CIPHER_AES_CCM:
case ATH9K_CIPHER_AES_OCB:
case ATH9K_CIPHER_TKIP:
case ATH9K_CIPHER_WEP:
case ATH9K_CIPHER_MIC:
case ATH9K_CIPHER_CLR:
return true;
default:
return false;
}
case ATH9K_CAP_TKIP_MIC: case ATH9K_CAP_TKIP_MIC:
switch (capability) { switch (capability) {
case 0: case 0:

1
drivers/net/wireless/ath/ath9k/hw.h
View File

@ -207,7 +207,6 @@ enum ath9k_hw_caps {
}; };
enum ath9k_capability_type { enum ath9k_capability_type {
ATH9K_CAP_CIPHER = 0,
ATH9K_CAP_TKIP_MIC, ATH9K_CAP_TKIP_MIC,
ATH9K_CAP_TKIP_SPLIT, ATH9K_CAP_TKIP_SPLIT,
ATH9K_CAP_TXPOW, ATH9K_CAP_TXPOW,

24
drivers/net/wireless/ath/ath9k/init.c
View File

@ -379,16 +379,13 @@ static void ath9k_init_crypto(struct ath_softc *sc)
for (i = 0; i < common->keymax; i++) for (i = 0; i < common->keymax; i++)
ath9k_hw_keyreset(sc->sc_ah, (u16) i); ath9k_hw_keyreset(sc->sc_ah, (u16) i);
if (ath9k_hw_getcapability(sc->sc_ah, ATH9K_CAP_CIPHER, /*
ATH9K_CIPHER_TKIP, NULL)) { * Whether we should enable h/w TKIP MIC.
/* * XXX: if we don't support WME TKIP MIC, then we wouldn't
* Whether we should enable h/w TKIP MIC. * report WMM capable, so it's always safe to turn on
* XXX: if we don't support WME TKIP MIC, then we wouldn't * TKIP MIC in this case.
* report WMM capable, so it's always safe to turn on */
* TKIP MIC in this case. ath9k_hw_setcapability(sc->sc_ah, ATH9K_CAP_TKIP_MIC, 0, 1, NULL);
*/
ath9k_hw_setcapability(sc->sc_ah, ATH9K_CAP_TKIP_MIC, 0, 1, NULL);
}
/* /*
* Check whether the separate key cache entries * Check whether the separate key cache entries
@ -396,12 +393,7 @@ static void ath9k_init_crypto(struct ath_softc *sc)
* With split mic keys the number of stations is limited * With split mic keys the number of stations is limited
* to 27 otherwise 59. * to 27 otherwise 59.
*/ */
if (ath9k_hw_getcapability(sc->sc_ah, ATH9K_CAP_CIPHER, if (ath9k_hw_getcapability(sc->sc_ah, ATH9K_CAP_TKIP_SPLIT, 0, NULL))
ATH9K_CIPHER_TKIP, NULL)
&& ath9k_hw_getcapability(sc->sc_ah, ATH9K_CAP_CIPHER,
ATH9K_CIPHER_MIC, NULL)
&& ath9k_hw_getcapability(sc->sc_ah, ATH9K_CAP_TKIP_SPLIT,
0, NULL))
common->splitmic = 1; common->splitmic = 1;
/* turn on mcast key search if possible */ /* turn on mcast key search if possible */