---

yaml --- r: 214719 b: refs/heads/master c: ce2220d h: refs/heads/master i: 214717: ec37cef 214715: c8fd54a 214711: ca9dee5 214703: ee9cd6c 214687: 0678b7e 214655: 54088f2 v: v3
git-mirror · Sep 21, 2010 · d701dc2 · d701dc2
1 parent 7fc8b9d
commit d701dc2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c807666a08800ab387298817db5a6f6e11606adb
+refs/heads/master: ce2220d1da0bad9583af38a03ad508968d554c0f
diff --git a/trunk/drivers/net/wireless/ath/ath.h b/trunk/drivers/net/wireless/ath/ath.h
@@ -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 {

diff --git a/trunk/drivers/net/wireless/ath/ath5k/attach.c b/trunk/drivers/net/wireless/ath/ath5k/attach.c
@@ -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;

diff --git a/trunk/drivers/net/wireless/ath/ath9k/hw.c b/trunk/drivers/net/wireless/ath/ath9k/hw.c
@@ -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