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, 1 insertions, 2 deletions

diff --git a/drivers/net/wireless/ath/ath5k/attach.c b/drivers/net/wireless/ath/ath5k/attach.c
index a0e08201c939..20d178eabc9c 100644
--- a/drivers/net/wireless/ath/ath5k/attach.c
+++ b/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;