From owner-p4-projects@FreeBSD.ORG  Wed Dec 29 19:58:32 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3233E16A4D0; Wed, 29 Dec 2004 19:58:32 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0D14216A4CE
	for <perforce@freebsd.org>; Wed, 29 Dec 2004 19:58:32 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EF62543D55
	for <perforce@freebsd.org>; Wed, 29 Dec 2004 19:58:31 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBTJwVP5041900
	for <perforce@freebsd.org>; Wed, 29 Dec 2004 19:58:31 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBTJwV6e041897
	for perforce@freebsd.org; Wed, 29 Dec 2004 19:58:31 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 29 Dec 2004 19:58:31 GMT
Message-Id: <200412291958.iBTJwV6e041897@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 67859 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Dec 2004 19:58:32 -0000

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

Change 67859 by sam@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;