ath9k_htc: Fix TKIP disconnect failure with HTC drivers
authorRajkumar Manoharan <rmanoharan@atheros.com>
Fri, 24 Sep 2010 12:28:50 +0000 (17:58 +0530)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 27 Sep 2010 19:57:56 +0000 (15:57 -0400)
The following commit removed splitmic. But forgot to add
ATH_CRYPT_CAP_MIC_COMBINED flag for HTC drivers which causes
TKIP to fail.

Author: Bruno Randolf <br1@einfach.org>
Date:   Wed Sep 8 16:04:54 2010 +0900

    ath/ath9k: Replace common->splitmic with a flag

    Replace common->splitmic with ATH_CRYPT_CAP_MIC_COMBINED flag.

Signed-off-by: Rajkumar Manoharan <rmanoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/htc_drv_init.c

index 33850c952314e5c38e0ae8cab28275f714a737cf..b100db2766cfc106d0b4f92312873cac2fd22d63 100644 (file)
@@ -561,6 +561,9 @@ static void ath9k_init_crypto(struct ath9k_htc_priv *priv)
                common->keymax = ATH_KEYMAX;
        }
 
+       if (priv->ah->misc_mode & AR_PCU_MIC_NEW_LOC_ENA)
+               common->crypt_caps |= ATH_CRYPT_CAP_MIC_COMBINED;
+
        /*
         * Reset the key cache since some parts do not
         * reset the contents on initial power up.