--- drivers/net/wireless/ath/ath9k/beacon.c

+++ drivers/net/wireless/ath/ath9k/beacon.c

@@ -512,16 +512,13 @@ static void ath_beacon_config_ap(struct

{

u32 nexttbtt, intval;

- /* Configure the timers only when the TSF has to be reset */

-

- if (!(sc->sc_flags & SC_OP_TSF_RESET))

- return;

-

/* NB: the beacon interval is kept internally in TU's */

intval = conf->beacon_interval & ATH9K_BEACON_PERIOD;

intval /= ATH_BCBUF; /* for staggered beacons */

nexttbtt = intval;

- intval |= ATH9K_BEACON_RESET_TSF;

+

+ if (sc->sc_flags & SC_OP_TSF_RESET)

+ intval |= ATH9K_BEACON_RESET_TSF;

/*

* In AP mode we enable the beacon timers and SWBA interrupts to