---

yaml
---
r: 121777
b: refs/heads/master
c: 154662a
h: refs/heads/master
i:
  121775: 259d36c
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c84b7978f1b99048bf31be5a0218cd509e74148
+refs/heads/master: 154662a6356ec3ccfea0a22218cf149220ea6373

trunk/drivers/net/wireless/ath9k/main.c

@@ -1237,17 +1237,6 @@ static int ath9k_config_interface(struct ieee80211_hw *hw,
 			/* Set aggregation protection mode parameters */
 			sc->sc_config.ath_aggr_prot = 0;
 
-			/*
-			 * Reset our TSF so that its value is lower than the
-			 * beacon that we are trying to catch.
-			 * Only then hw will update its TSF register with the
-			 * new beacon. Reset the TSF before setting the BSSID
-			 * to avoid allowing in any frames that would update
-			 * our TSF only to have us clear it
-			 * immediately thereafter.
-			 */
-			ath9k_hw_reset_tsf(sc->sc_ah);
-
 			/* Disable BMISS interrupt when we're not associated */
 			ath9k_hw_set_interrupts(sc->sc_ah,
 					sc->sc_imask &