---

yaml --- r: 187999 b: refs/heads/master c: a3b980f h: refs/heads/master i: 187997: 7817e74 187995: 12781c5 187991: 02a55e9 187983: 9dbb0ed 187967: 4d4a899 v: v3
git-mirror · Mar 10, 2010 · 4aaf7e7 · 4aaf7e7
1 parent 38cb150
commit 4aaf7e7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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;
 }