aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath5k/reset.c
diff options
context:
space:
mode:
authorBruno Randolf <br1@einfach.org>2010-03-09 16:55:33 +0900
committerJohn W. Linville <linville@tuxdriver.com>2010-03-10 16:16:56 -0500
commita3b980fd1391e75068ae25f3817728b27bfdb04c (patch)
tree4c72c354dcc187eecd19f94f80e5535cdd2baee2 /drivers/net/wireless/ath/ath5k/reset.c
parent8bd8beab49fec3f7d014c328641bd94de3df744b (diff)
downloadkernel_samsung_crespo-a3b980fd1391e75068ae25f3817728b27bfdb04c.zip
kernel_samsung_crespo-a3b980fd1391e75068ae25f3817728b27bfdb04c.tar.gz
kernel_samsung_crespo-a3b980fd1391e75068ae25f3817728b27bfdb04c.tar.bz2
ath5k: fix TSF reset
to reset the TSF, AR5K_BEACON_RESET_TSF has to be 1, not 0. also we have a function for that so use it. Signed-off-by: Bruno Randolf <br1@einfach.org> Acked-by: Nick Kossifidis <mickflemm@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath5k/reset.c')
-rw-r--r--drivers/net/wireless/ath/ath5k/reset.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ath5k/reset.c b/drivers/net/wireless/ath/ath5k/reset.c
index a35a7db..c780b55 100644
--- a/drivers/net/wireless/ath/ath5k/reset.c
+++ b/drivers/net/wireless/ath/ath5k/reset.c
@@ -1379,11 +1379,10 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode,
ath5k_hw_set_sleep_clock(ah, true);
/*
- * Disable beacons and reset the register
+ * Disable beacons and reset the TSF
*/
- AR5K_REG_DISABLE_BITS(ah, AR5K_BEACON, AR5K_BEACON_ENABLE |
- AR5K_BEACON_RESET_TSF);
-
+ AR5K_REG_DISABLE_BITS(ah, AR5K_BEACON, AR5K_BEACON_ENABLE);
+ ath5k_hw_reset_tsf(ah);
return 0;
}