Commit ce2220d1 authored by Bruno Randolf's avatar Bruno Randolf Committed by John W. Linville
Browse files

ath/ath5k/ath9k: Fix crypto capabilities merge issue

Fixing up a merge issue / concurrent development:

Remove unneeded ath_crypt_caps flags, as per "ath9k_hw: remove useless hw
capability flags" (364734fa

), but set the
AESCCM flag for ath9k. common ath code still needs a flag for this because
there is ath5k hardware which can't do AES in hardware.
Signed-off-by: default avatarBruno Randolf <br1@einfach.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c807666a
......@@ -72,13 +72,8 @@ struct ath_regulatory {
};
enum ath_crypt_caps {
ATH_CRYPT_CAP_MIC_AESCCM = BIT(0),
ATH_CRYPT_CAP_MIC_CKIP = BIT(1),
ATH_CRYPT_CAP_MIC_TKIP = BIT(2),
ATH_CRYPT_CAP_CIPHER_AESCCM = BIT(3),
ATH_CRYPT_CAP_CIPHER_CKIP = BIT(4),
ATH_CRYPT_CAP_CIPHER_TKIP = BIT(5),
ATH_CRYPT_CAP_MIC_COMBINED = BIT(6),
ATH_CRYPT_CAP_CIPHER_AESCCM = BIT(0),
ATH_CRYPT_CAP_MIC_COMBINED = BIT(1),
};
struct ath_keyval {
......
......@@ -320,8 +320,7 @@ int ath5k_hw_attach(struct ath5k_softc *sc)
if (srev >= AR5K_SREV_AR5212_V4 &&
(ee->ee_version >= AR5K_EEPROM_VERSION_5_0 &&
!AR5K_EEPROM_AES_DIS(ee->ee_misc5)))
common->crypt_caps |= ATH_CRYPT_CAP_CIPHER_AESCCM |
ATH_CRYPT_CAP_MIC_AESCCM;
common->crypt_caps |= ATH_CRYPT_CAP_CIPHER_AESCCM;
if (srev >= AR5K_SREV_AR2414) {
common->crypt_caps |= ATH_CRYPT_CAP_MIC_COMBINED;
......
......@@ -1866,6 +1866,8 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)
pCap->low_5ghz_chan = 4920;
pCap->high_5ghz_chan = 6100;
common->crypt_caps |= ATH_CRYPT_CAP_CIPHER_AESCCM;
if (ah->config.ht_enable)
pCap->hw_caps |= ATH9K_HW_CAP_HT;
else
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment