ath9k_hw: remove ATH9K_CAP_TKIP_MIC

TKIP MIC support is always enabled anyway.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
index a26bc5696523a2dadf736ca73557686f6500be37..03100e3cdfc44562c2f004ccb452b59420a6a969 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
@@ -570,14 +570,6 @@ static void ath9k_init_crypto(struct ath9k_htc_priv *priv)
        for (i = 0; i < common->keymax; i++)
                ath9k_hw_keyreset(priv->ah, (u16) i);
 
-       /*
-        * Whether we should enable h/w TKIP MIC.
-        * XXX: if we don't support WME TKIP MIC, then we wouldn't
-        * report WMM capable, so it's always safe to turn on
-        * TKIP MIC in this case.
-        */
-       ath9k_hw_setcapability(priv->ah, ATH9K_CAP_TKIP_MIC, 0, 1, NULL);
-
        /*
         * Check whether the separate key cache entries
         * are required to handle both tx+rx MIC keys.

diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index d908f78da42bfed2193bcf56cd1ed11d03128fd2..f1d9918a11bd4fea630c2f77e6aabed6a677f614 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -2259,15 +2259,6 @@ bool ath9k_hw_getcapability(struct ath_hw *ah, enum ath9k_capability_type type,
                            u32 capability, u32 *result)
 {
        switch (type) {
-       case ATH9K_CAP_TKIP_MIC:
-               switch (capability) {
-               case 0:
-                       return true;
-               case 1:
-                       return (ah->sta_id1_defaults &
-                               AR_STA_ID1_CRPT_MIC_ENABLE) ? true :
-                       false;
-               }
        case ATH9K_CAP_TKIP_SPLIT:
                return (ah->misc_mode & AR_PCU_MIC_NEW_LOC_ENA) ?
                        false : true;
@@ -2299,14 +2290,6 @@ bool ath9k_hw_setcapability(struct ath_hw *ah, enum ath9k_capability_type type,
                            u32 capability, u32 setting, int *status)
 {
        switch (type) {
-       case ATH9K_CAP_TKIP_MIC:
-               if (setting)
-                       ah->sta_id1_defaults |=
-                               AR_STA_ID1_CRPT_MIC_ENABLE;
-               else
-                       ah->sta_id1_defaults &=
-                               ~AR_STA_ID1_CRPT_MIC_ENABLE;
-               return true;
        case ATH9K_CAP_MCAST_KEYSRCH:
                if (setting)
                        ah->sta_id1_defaults |= AR_STA_ID1_MCAST_KSRCH;

diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index 7456850f08b89a6ebb054569e14b1858b4a765f7..5574daa28b4df73fab9751b71def9c084c71ae3e 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -207,7 +207,6 @@ enum ath9k_hw_caps {
 };
 
 enum ath9k_capability_type {
-       ATH9K_CAP_TKIP_MIC,
        ATH9K_CAP_TKIP_SPLIT,
        ATH9K_CAP_MCAST_KEYSRCH,
        ATH9K_CAP_DS

diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index 8bb866d52e2ab4ff9ee92d3490e083dc8679a149..f66b357ba4d10b6e91acd7fd9bf46c271167fbc1 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -379,14 +379,6 @@ static void ath9k_init_crypto(struct ath_softc *sc)
        for (i = 0; i < common->keymax; i++)
                ath9k_hw_keyreset(sc->sc_ah, (u16) i);
 
-       /*
-        * Whether we should enable h/w TKIP MIC.
-        * XXX: if we don't support WME TKIP MIC, then we wouldn't
-        * report WMM capable, so it's always safe to turn on
-        * TKIP MIC in this case.
-        */
-       ath9k_hw_setcapability(sc->sc_ah, ATH9K_CAP_TKIP_MIC, 0, 1, NULL);
-
        /*
         * Check whether the separate key cache entries
         * are required to handle both tx+rx MIC keys.