diff options
authorFelix Fietkau <nbd@openwrt.org>2010-02-19 18:21:42 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-15 08:49:59 -0700
commit9ba155b84391989fb97ddb210c741d6abc44a613 (patch)
parentc6476d517ed62121444df6e3cbf7a494a463a74d (diff)
ath9k: fix beacon timer restart after a card reset
commit d8728ee919282c7b01b65cd479ec1e2a9c5d3ba8 upstream. In AP mode, ath_beacon_config_ap only restarts the timer if a TSF restart is requested. Apparently this was added, because this function unconditionally sets the flag for TSF reset. The problem with this is, that ath9k_hw_reset() clobbers the timer registers (specified in the initvals), thus effectively disabling the SWBA interrupt whenever a card reset without TSF reset is issued (happens in a few places in the code). This patch fixes ath_beacon_config_ap to only issue the TSF reset flag when necessary, but reinitialize the timer unconditionally. Tests show, that this is enough to keep the SWBA interrupt going after a call to ath_reset() Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c
index 45c4ea57616b..72e24559ec4b 100644
--- a/drivers/net/wireless/ath/ath9k/beacon.c
+++ b/drivers/net/wireless/ath/ath9k/beacon.c
@@ -512,16 +512,13 @@ static void ath_beacon_config_ap(struct ath_softc *sc,
u32 nexttbtt, intval;
- /* Configure the timers only when the TSF has to be reset */
- if (!(sc->sc_flags & SC_OP_TSF_RESET))
- return;
/* NB: the beacon interval is kept internally in TU's */
intval = conf->beacon_interval & ATH9K_BEACON_PERIOD;
intval /= ATH_BCBUF; /* for staggered beacons */
nexttbtt = intval;
+ if (sc->sc_flags & SC_OP_TSF_RESET)
* In AP mode we enable the beacon timers and SWBA interrupts to