From owner-p4-projects@FreeBSD.ORG  Tue Dec 28 16:15:39 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4376116A4D0; Tue, 28 Dec 2004 16:15:39 +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 F220716A4CE
	for <perforce@freebsd.org>; Tue, 28 Dec 2004 16:15:38 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E07DE43D45
	for <perforce@freebsd.org>; Tue, 28 Dec 2004 16:15:38 +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 iBSGFcF1028821
	for <perforce@freebsd.org>; Tue, 28 Dec 2004 16:15:38 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBSGFcJT028818
	for perforce@freebsd.org; Tue, 28 Dec 2004 16:15:38 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 28 Dec 2004 16:15:38 GMT
Message-Id: <200412281615.iBSGFcJT028818@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 67796 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: Tue, 28 Dec 2004 16:15:40 -0000

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

Change 67796 by sam@sam_ebb on 2004/12/28 16:15:34

	check for beacon interval being zero when setting up
	the beacon timers; this can happen when an interface
	is configured in monitor mode w/o previous configuration

Affected files ...

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

Differences ...

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

@@ -1984,7 +1984,8 @@
 	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;
-	nexttbtt = roundup(nexttbtt, intval);
+	if (intval)			/* NB: can be 0 for monitor mode */
+		nexttbtt = roundup(nexttbtt, intval);
 	if (ic->ic_opmode == IEEE80211_M_STA) {
 		HAL_BEACON_STATE bs;
 		u_int32_t bmisstime;