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

Replace common->splitmic with ATH_CRYPT_CAP_MIC_COMBINED flag.

splitmic has to be used when the ATH_CRYPT_CAP_MIC_COMBINED capability flag is
not set.

Signed-off-by: Bruno Randolf <br1@einfach.org>
Acked-by: Bob Copeland <me@bobcopeland.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h
index fb24f66373fd64a45a97bb58a036af2e696f4423..c5584077d1de36e500bb783bd75bcc64bcfd887a 100644 (file)
--- a/drivers/net/wireless/ath/ath.h
+++ b/drivers/net/wireless/ath/ath.h
@@ -78,6 +78,7 @@ enum ath_crypt_caps {
        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),
 };
 
 struct ath_keyval {
@@ -150,7 +151,6 @@ struct ath_common {
        u32 keymax;
        DECLARE_BITMAP(keymap, ATH_KEYMAX);
        DECLARE_BITMAP(tkip_keymap, ATH_KEYMAX);
-       u8 splitmic;
        enum ath_crypt_caps crypt_caps;
 
        struct ath_regulatory regulatory;

diff --git a/drivers/net/wireless/ath/ath9k/common.c b/drivers/net/wireless/ath/ath9k/common.c
index 2dab64bb23a8dc4aebb51d0d9f406e222059c670..2db24eb5f0ee6c5b7994dfdf8d686186bc702d92 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/common.c
+++ b/drivers/net/wireless/ath/ath9k/common.c
@@ -174,7 +174,7 @@ static int ath_setkey_tkip(struct ath_common *common, u16 keyix, const u8 *key,
                }
                return ath9k_hw_set_keycache_entry(ah, keyix, hk, addr);
        }
-       if (!common->splitmic) {
+       if (common->crypt_caps & ATH_CRYPT_CAP_MIC_COMBINED) {
                /* TX and RX keys share the same key cache entry. */
                memcpy(hk->kv_mic, key_rxmic, sizeof(hk->kv_mic));
                memcpy(hk->kv_txmic, key_txmic, sizeof(hk->kv_txmic));
@@ -205,7 +205,7 @@ static int ath_reserve_key_cache_slot_tkip(struct ath_common *common)
                if (test_bit(i, common->keymap) ||
                    test_bit(i + 64, common->keymap))
                        continue; /* At least one part of TKIP key allocated */
-               if (common->splitmic &&
+               if (!(common->crypt_caps & ATH_CRYPT_CAP_MIC_COMBINED) &&
                    (test_bit(i + 32, common->keymap) ||
                     test_bit(i + 64 + 32, common->keymap)))
                        continue; /* At least one part of TKIP key allocated */
@@ -225,7 +225,7 @@ static int ath_reserve_key_cache_slot(struct ath_common *common,
                return ath_reserve_key_cache_slot_tkip(common);
 
        /* First, try to find slots that would not be available for TKIP. */
-       if (common->splitmic) {
+       if (!(common->crypt_caps & ATH_CRYPT_CAP_MIC_COMBINED)) {
                for (i = IEEE80211_WEP_NKID; i < common->keymax / 4; i++) {
                        if (!test_bit(i, common->keymap) &&
                            (test_bit(i + 32, common->keymap) ||
@@ -266,7 +266,7 @@ static int ath_reserve_key_cache_slot(struct ath_common *common,
                 * TKIP will not be used. */
                if (i >= 64 && i < 64 + IEEE80211_WEP_NKID)
                        continue;
-               if (common->splitmic) {
+               if (!(common->crypt_caps & ATH_CRYPT_CAP_MIC_COMBINED)) {
                        if (i >= 32 && i < 32 + IEEE80211_WEP_NKID)
                                continue;
                        if (i >= 64 + 32 && i < 64 + 32 + IEEE80211_WEP_NKID)
@@ -374,7 +374,7 @@ int ath9k_cmn_key_config(struct ath_common *common,
                set_bit(idx + 64, common->keymap);
                set_bit(idx, common->tkip_keymap);
                set_bit(idx + 64, common->tkip_keymap);
-               if (common->splitmic) {
+               if (!(common->crypt_caps & ATH_CRYPT_CAP_MIC_COMBINED)) {
                        set_bit(idx + 32, common->keymap);
                        set_bit(idx + 64 + 32, common->keymap);
                        set_bit(idx + 32, common->tkip_keymap);
@@ -407,7 +407,7 @@ void ath9k_cmn_key_delete(struct ath_common *common,
        clear_bit(key->hw_key_idx, common->tkip_keymap);
        clear_bit(key->hw_key_idx + 64, common->tkip_keymap);
 
-       if (common->splitmic) {
+       if (!(common->crypt_caps & ATH_CRYPT_CAP_MIC_COMBINED)) {
                ath9k_hw_keyreset(ah, key->hw_key_idx + 32);
                clear_bit(key->hw_key_idx + 32, common->keymap);
                clear_bit(key->hw_key_idx + 64 + 32, common->keymap);

diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index 5c77a9913e0309fd71b9f75d59a99406b5897cb1..fd651d8ef816076eb25a37e738e02250fc740c54 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -389,8 +389,8 @@ static void ath9k_init_crypto(struct ath_softc *sc)
         * With split mic keys the number of stations is limited
         * to 27 otherwise 59.
         */
-       if (!(sc->sc_ah->misc_mode & AR_PCU_MIC_NEW_LOC_ENA))
-               common->splitmic = 1;
+       if (sc->sc_ah->misc_mode & AR_PCU_MIC_NEW_LOC_ENA)
+               common->crypt_caps |= ATH_CRYPT_CAP_MIC_COMBINED;
 }
 
 static int ath9k_init_btcoex(struct ath_softc *sc)

diff --git a/drivers/net/wireless/ath/key.c b/drivers/net/wireless/ath/key.c
index e45b8546810a9ab96d1f59be83a89854ae082820..bd21a4d82085b5131cb89497bff4d939275c3748 100644 (file)
--- a/drivers/net/wireless/ath/key.c
+++ b/drivers/net/wireless/ath/key.c
@@ -201,7 +201,7 @@ bool ath_hw_set_keycache_entry(struct ath_common *common, u16 entry,
                /* Write MAC address for the entry */
                (void) ath_hw_keysetmac(common, entry, mac);
 
-               if (common->splitmic == 0) {
+               if (common->crypt_caps & ATH_CRYPT_CAP_MIC_COMBINED) {
                        /*
                         * TKIP uses two key cache entries:
                         * Michael MIC TX/RX keys in the same key cache entry
@@ -327,7 +327,7 @@ static int ath_setkey_tkip(struct ath_common *common, u16 keyix, const u8 *key,
                }
                return ath_hw_set_keycache_entry(common, keyix, hk, addr);
        }
-       if (!common->splitmic) {
+       if (common->crypt_caps & ATH_CRYPT_CAP_MIC_COMBINED) {
                /* TX and RX keys share the same key cache entry. */
                memcpy(hk->kv_mic, key_rxmic, sizeof(hk->kv_mic));
                memcpy(hk->kv_txmic, key_txmic, sizeof(hk->kv_txmic));
@@ -358,7 +358,7 @@ static int ath_reserve_key_cache_slot_tkip(struct ath_common *common)
                if (test_bit(i, common->keymap) ||
                    test_bit(i + 64, common->keymap))
                        continue; /* At least one part of TKIP key allocated */
-               if (common->splitmic &&
+               if (!(common->crypt_caps & ATH_CRYPT_CAP_MIC_COMBINED) &&
                    (test_bit(i + 32, common->keymap) ||
                     test_bit(i + 64 + 32, common->keymap)))
                        continue; /* At least one part of TKIP key allocated */
@@ -378,7 +378,7 @@ static int ath_reserve_key_cache_slot(struct ath_common *common,
                return ath_reserve_key_cache_slot_tkip(common);
 
        /* First, try to find slots that would not be available for TKIP. */
-       if (common->splitmic) {
+       if (!(common->crypt_caps & ATH_CRYPT_CAP_MIC_COMBINED)) {
                for (i = IEEE80211_WEP_NKID; i < common->keymax / 4; i++) {
                        if (!test_bit(i, common->keymap) &&
                            (test_bit(i + 32, common->keymap) ||
@@ -419,7 +419,7 @@ static int ath_reserve_key_cache_slot(struct ath_common *common,
                 * TKIP will not be used. */
                if (i >= 64 && i < 64 + IEEE80211_WEP_NKID)
                        continue;
-               if (common->splitmic) {
+               if (!(common->crypt_caps & ATH_CRYPT_CAP_MIC_COMBINED)) {
                        if (i >= 32 && i < 32 + IEEE80211_WEP_NKID)
                                continue;
                        if (i >= 64 + 32 && i < 64 + 32 + IEEE80211_WEP_NKID)
@@ -526,7 +526,7 @@ int ath_key_config(struct ath_common *common,
                set_bit(idx + 64, common->keymap);
                set_bit(idx, common->tkip_keymap);
                set_bit(idx + 64, common->tkip_keymap);
-               if (common->splitmic) {
+               if (!(common->crypt_caps & ATH_CRYPT_CAP_MIC_COMBINED)) {
                        set_bit(idx + 32, common->keymap);
                        set_bit(idx + 64 + 32, common->keymap);
                        set_bit(idx + 32, common->tkip_keymap);
@@ -556,7 +556,7 @@ void ath_key_delete(struct ath_common *common, struct ieee80211_key_conf *key)
        clear_bit(key->hw_key_idx, common->tkip_keymap);
        clear_bit(key->hw_key_idx + 64, common->tkip_keymap);
 
-       if (common->splitmic) {
+       if (!(common->crypt_caps & ATH_CRYPT_CAP_MIC_COMBINED)) {
                ath_hw_keyreset(common, key->hw_key_idx + 32);
                clear_bit(key->hw_key_idx + 32, common->keymap);
                clear_bit(key->hw_key_idx + 64 + 32, common->keymap);