ath9k: Remove SC_OP_ENABLE_APM

Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index c03949eb37c893ea102879484d486ac7a4ea9be0..4b08a3d3195dcbb6088db2668922ad2d874ed5f1 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -558,8 +558,7 @@ struct ath_ant_comb {
 #define SC_OP_BT_PRIORITY_DETECTED   BIT(12)
 #define SC_OP_BT_SCAN               BIT(13)
 #define SC_OP_ANI_RUN               BIT(14)
-#define SC_OP_ENABLE_APM            BIT(15)
-#define SC_OP_PRIM_STA_VIF          BIT(16)
+#define SC_OP_PRIM_STA_VIF          BIT(15)
 
 /* Powersave flags */
 #define PS_WAIT_FOR_BEACON        BIT(0)

diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 3c5db3063877bc9704ea10cc25ad50f8b2d3aa67..2af4a1c2e2d66b2429bcaef1963a6e28c053e7b5 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -565,7 +565,6 @@ set_timer:
 static void ath_node_attach(struct ath_softc *sc, struct ieee80211_sta *sta)
 {
        struct ath_node *an;
-       struct ath_hw *ah = sc->sc_ah;
        an = (struct ath_node *)sta->drv_priv;
 
 #ifdef CONFIG_ATH9K_DEBUGFS
@@ -574,9 +573,6 @@ static void ath_node_attach(struct ath_softc *sc, struct ieee80211_sta *sta)
        spin_unlock(&sc->nodes_lock);
        an->sta = sta;
 #endif
-       if ((ah->caps.hw_caps) & ATH9K_HW_CAP_APM)
-               sc->sc_flags |= SC_OP_ENABLE_APM;
-
        if (sc->sc_flags & SC_OP_TXAGGR) {
                ath_tx_node_init(sc, an);
                an->maxampdu = 1 << (IEEE80211_HT_MAX_AMPDU_FACTOR +

diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index feef0135515c0e0fa3ef4e14790816462ba7cd98..20626729795d8df2322df3e20b52055a50ee99cc 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -1584,9 +1584,9 @@ u8 ath_txchainmask_reduction(struct ath_softc *sc, u8 chainmask, u32 rate)
 {
        struct ath_hw *ah = sc->sc_ah;
        struct ath9k_channel *curchan = ah->curchan;
-       if ((sc->sc_flags & SC_OP_ENABLE_APM) &&
-                       (curchan->channelFlags & CHANNEL_5GHZ) &&
-                       (chainmask == 0x7) && (rate < 0x90))
+       if ((ah->caps.hw_caps & ATH9K_HW_CAP_APM) &&
+           (curchan->channelFlags & CHANNEL_5GHZ) &&
+           (chainmask == 0x7) && (rate < 0x90))
                return 0x3;
        else
                return chainmask;