diff options
author | Sujith <Sujith.Manoharan@atheros.com> | 2009-03-30 05:58:43 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-04-22 16:54:34 -0400 |
commit | 4658b985170d9d0c88304d2d4459938b600f8c0b (patch) | |
tree | aef8a74a907e7558db64c66eff6ddda08e81715b /drivers | |
parent | 7dd58748592db1e5a77cfbddb8beffcfdb0242fe (diff) |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/ath9k/ath9k.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/ath9k/main.c | 14 |
2 files changed, 0 insertions, 15 deletions
diff --git a/drivers/net/wireless/ath9k/ath9k.h b/drivers/net/wireless/ath9k/ath9k.h index 9a12f76988da..0ef89bb73f31 100644 --- a/drivers/net/wireless/ath9k/ath9k.h +++ b/drivers/net/wireless/ath9k/ath9k.h | |||
@@ -66,7 +66,6 @@ struct ath_config { | |||
66 | u32 ath_aggr_prot; | 66 | u32 ath_aggr_prot; |
67 | u16 txpowlimit; | 67 | u16 txpowlimit; |
68 | u8 cabqReadytime; | 68 | u8 cabqReadytime; |
69 | u8 swBeaconProcess; | ||
70 | }; | 69 | }; |
71 | 70 | ||
72 | /*************************/ | 71 | /*************************/ |
diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c index f5a541b864ce..0c1cc2d62a80 100644 --- 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) | |||
1542 | sc->beacon.bslot_aphy[i] = NULL; | 1542 | sc->beacon.bslot_aphy[i] = NULL; |
1543 | } | 1543 | } |
1544 | 1544 | ||
1545 | /* save MISC configurations */ | ||
1546 | sc->config.swBeaconProcess = 1; | ||
1547 | |||
1548 | /* setup channels and rates */ | 1545 | /* setup channels and rates */ |
1549 | 1546 | ||
1550 | sc->sbands[IEEE80211_BAND_2GHZ].channels = ath9k_2ghz_chantable; | 1547 | sc->sbands[IEEE80211_BAND_2GHZ].channels = ath9k_2ghz_chantable; |
@@ -2253,17 +2250,6 @@ static int ath9k_add_interface(struct ieee80211_hw *hw, | |||
2253 | sc->imask |= ATH9K_INT_TSFOOR; | 2250 | sc->imask |= ATH9K_INT_TSFOOR; |
2254 | } | 2251 | } |
2255 | 2252 | ||
2256 | /* | ||
2257 | * Some hardware processes the TIM IE and fires an | ||
2258 | * interrupt when the TIM bit is set. For hardware | ||
2259 | * that does, if not overridden by configuration, | ||
2260 | * enable the TIM interrupt when operating as station. | ||
2261 | */ | ||
2262 | if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_ENHANCEDPM) && | ||
2263 | (conf->type == NL80211_IFTYPE_STATION) && | ||
2264 | !sc->config.swBeaconProcess) | ||
2265 | sc->imask |= ATH9K_INT_TIM; | ||
2266 | |||
2267 | ath9k_hw_set_interrupts(sc->sc_ah, sc->imask); | 2253 | ath9k_hw_set_interrupts(sc->sc_ah, sc->imask); |
2268 | 2254 | ||
2269 | if (conf->type == NL80211_IFTYPE_AP) { | 2255 | if (conf->type == NL80211_IFTYPE_AP) { |