From d701dc223de6e3d6ff9fd023633599e3b4782790 Mon Sep 17 00:00:00 2001
From: Bruno Randolf <br1@einfach.org>
Date: Fri, 17 Sep 2010 11:36:25 +0900
Subject: [PATCH] --- yaml --- r: 214719 b: refs/heads/master c:
 ce2220d1da0bad9583af38a03ad508968d554c0f h: refs/heads/master i:   214717:
 ec37cefa5242ecf2c9a52b455897a0ae29bb42a2   214715:
 c8fd54aca518554509a1260ad2a639bc89780a07   214711:
 ca9dee55b2aefe2067ebf637d16689203f5102f5   214703:
 ee9cd6c00451e14d717487b0aa09ed68e8a7607d   214687:
 0678b7e1b2a786bf5c0cf4d17d534dae4f636d03   214655:
 54088f2940d5e768919f4cbb6c1791a679577c9e v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/net/wireless/ath/ath.h          | 9 ++-------
 trunk/drivers/net/wireless/ath/ath5k/attach.c | 3 +--
 trunk/drivers/net/wireless/ath/ath9k/hw.c     | 2 ++
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 4133ac380546..25fde5380f4e 100644
--- 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
index c5584077d1de..dd236c3b52f6 100644
--- 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
index a0e08201c939..20d178eabc9c 100644
--- 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
index f3c9d7549571..0b2ff98b6f33 100644
--- 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