diff --git a/[refs] b/[refs]
index 8e4b4d24ae11..fbed15d1ec22 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bdceeb2dad5c8487ffeb4d0fa949686e4350ec7f
+refs/heads/master: f452a63d1ea7d2bae9b4a0cd0a865bcee7ce90c4
diff --git a/trunk/drivers/net/wireless/ath9k/beacon.c b/trunk/drivers/net/wireless/ath9k/beacon.c
index 390d5109e826..18bda362d3ab 100644
--- a/trunk/drivers/net/wireless/ath9k/beacon.c
+++ b/trunk/drivers/net/wireless/ath9k/beacon.c
@@ -790,8 +790,6 @@ void ath_beacon_config(struct ath_softc *sc, int if_id)
 		u64 tsf;
 		u32 tsftu;
 		ath9k_hw_set_interrupts(ah, 0);
-		if (nexttbtt == intval)
-			intval |= ATH9K_BEACON_RESET_TSF;
 		if (sc->sc_ah->opmode == NL80211_IFTYPE_ADHOC) {
 			/*
 			 * Pull nexttbtt forward to reflect the current
@@ -825,6 +823,9 @@ void ath_beacon_config(struct ath_softc *sc, int if_id)
 				sc->imask |= ATH9K_INT_SWBA;
 			ath_beaconq_config(sc);
 		} else if (sc->sc_ah->opmode == NL80211_IFTYPE_AP) {
+			if (nexttbtt == intval)
+				intval |= ATH9K_BEACON_RESET_TSF;
+
 			/*
 			 * In AP mode we enable the beacon timers and
 			 * SWBA interrupts to prepare beacon frames.