From 4aaf7e747b34ae51de5fd04dd8661bca7283bd2a Mon Sep 17 00:00:00 2001
From: Bruno Randolf <br1@einfach.org>
Date: Tue, 9 Mar 2010 16:55:33 +0900
Subject: [PATCH] --- yaml --- r: 187999 b: refs/heads/master c:
 a3b980fd1391e75068ae25f3817728b27bfdb04c h: refs/heads/master i:   187997:
 7817e74d7a0c127fcb93a045f451f083f7ab3021   187995:
 12781c5a87a35fb3e2a9a1ac6a35e521cfbccaa7   187991:
 02a55e9560c93a20df26ea024c3d3f9ccdc6216f   187983:
 9dbb0ed862e355d4a3211b95b704f5eb3bf1eb79   187967:
 4d4a89995c1d70b56216f1383d0120f2f57be751 v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/net/wireless/ath/ath5k/reset.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 892c743eda6a..3091c8b7e967 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8bd8beab49fec3f7d014c328641bd94de3df744b
+refs/heads/master: a3b980fd1391e75068ae25f3817728b27bfdb04c
diff --git a/trunk/drivers/net/wireless/ath/ath5k/reset.c b/trunk/drivers/net/wireless/ath/ath5k/reset.c
index a35a7db0fc4c..c780b55020d2 100644
--- a/trunk/drivers/net/wireless/ath/ath5k/reset.c
+++ b/trunk/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;
 }