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" (364734fafbba0c3133e482db78149b9a823ae7a5), 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: Bruno Randolf <br1@einfach.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 2 insertions, 7 deletions

diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h
index c5584077d1de..dd236c3b52f6 100644
--- a/drivers/net/wireless/ath/ath.h
+++ b/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 {