ath9k: Remove TIM from the interrupt mask

We never handle TIM, TIM_TIMER is used instead.
Remove this and the unnecessary swBeaconProcess variable.

Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath9k/ath9k.h b/drivers/net/wireless/ath9k/ath9k.h
index 9a12f76988daf972ce74c49c75215f3620deb401..0ef89bb73f316ad551a9b3fd6a460b2fd4783fc0 100644 (file)
--- a/drivers/net/wireless/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath9k/ath9k.h
@@ -66,7 +66,6 @@ struct ath_config {
        u32 ath_aggr_prot;
        u16 txpowlimit;
        u8 cabqReadytime;
-       u8 swBeaconProcess;
 };
 
 /*************************/

diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c
index f5a541b864ce4d8a1214c569a0768aae0d6d846f..0c1cc2d62a80364595dcd063a71721fb82beac38 100644 (file)
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
@@ -1542,9 +1542,6 @@ static int ath_init(u16 devid, struct ath_softc *sc)
                sc->beacon.bslot_aphy[i] = NULL;
        }
 
-       /* save MISC configurations */
-       sc->config.swBeaconProcess = 1;
-
        /* setup channels and rates */
 
        sc->sbands[IEEE80211_BAND_2GHZ].channels = ath9k_2ghz_chantable;
@@ -2253,17 +2250,6 @@ static int ath9k_add_interface(struct ieee80211_hw *hw,
                sc->imask |= ATH9K_INT_TSFOOR;
        }
 
-       /*
-        * Some hardware processes the TIM IE and fires an
-        * interrupt when the TIM bit is set.  For hardware
-        * that does, if not overridden by configuration,
-        * enable the TIM interrupt when operating as station.
-        */
-       if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_ENHANCEDPM) &&
-           (conf->type == NL80211_IFTYPE_STATION) &&
-           !sc->config.swBeaconProcess)
-               sc->imask |= ATH9K_INT_TIM;
-
        ath9k_hw_set_interrupts(sc->sc_ah, sc->imask);
 
        if (conf->type == NL80211_IFTYPE_AP) {