PERFORCE change 67859 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=67859

Change 67859 by sam at sam_ebb on 2004/12/29 19:58:02

	fix beacon timer setup for ap mode

Affected files ...

.. //depot/projects/wifi/sys/dev/ath/if_ath.c#49 edit

Differences ...

==== //depot/projects/wifi/sys/dev/ath/if_ath.c#49 (text+ko) ====

@@ -1981,11 +1981,13 @@
 
 	nexttbtt = (LE_READ_4(ni->ni_tstamp.data + 4) << 22) |
 	    (LE_READ_4(ni->ni_tstamp.data) >> 10);
-	DPRINTF(sc, ATH_DEBUG_BEACON, "%s: nexttbtt %u intval %u\n",
-		__func__, nexttbtt, ni->ni_intval);
 	intval = MS_TO_TU(ni->ni_intval) & HAL_BEACON_PERIOD;
-	if (intval)			/* NB: can be 0 for monitor mode */
+	if (nexttbtt == 0)		/* e.g. for ap mode */
+		nexttbtt = intval;
+	else if (intval)		/* NB: can be 0 for monitor mode */
 		nexttbtt = roundup(nexttbtt, intval);
+	DPRINTF(sc, ATH_DEBUG_BEACON, "%s: nexttbtt %u intval %u (%u)\n",
+		__func__, nexttbtt, intval, ni->ni_intval);
 	if (ic->ic_opmode == IEEE80211_M_STA) {
 		HAL_BEACON_STATE bs;
 		u_int32_t bmisstime;