From owner-p4-projects@FreeBSD.ORG  Fri Jan 21 01:35:05 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CAFF816A4E6; Fri, 21 Jan 2005 01:35:03 +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 DBE4616A4D4
	for <perforce@freebsd.org>; Fri, 21 Jan 2005 01:35:01 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C8AC043D48
	for <perforce@freebsd.org>; Fri, 21 Jan 2005 01:35:01 +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 j0L1Z1mA009850
	for <perforce@freebsd.org>; Fri, 21 Jan 2005 01:35:01 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0L1Z1L5009846
	for perforce@freebsd.org; Fri, 21 Jan 2005 01:35:01 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 21 Jan 2005 01:35:01 GMT
Message-Id: <200501210135.j0L1Z1L5009846@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 69405 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: Fri, 21 Jan 2005 01:35:05 -0000

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

Change 69405 by sam@sam_ebb on 2005/01/21 01:34:28

	use net80211 macros to convert ms->TU's

Affected files ...

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

Differences ...

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

@@ -2335,7 +2335,6 @@
 static void
 ath_beacon_config(struct ath_softc *sc)
 {
-#define	MS_TO_TU(x)	(((x) * 1000) / 1024)
 	struct ath_hal *ah = sc->sc_ah;
 	struct ieee80211com *ic = &sc->sc_ic;
 	struct ieee80211_node *ni = ic->ic_bss;
@@ -2389,7 +2388,8 @@
 		 *
 		 * XXX fixed at 100ms
 		 */
-		bs.bs_sleepduration = roundup(MS_TO_TU(100), bs.bs_intval);
+		bs.bs_sleepduration =
+			roundup(IEEE80211_MS_TO_TU(100), bs.bs_intval);
 		if (bs.bs_sleepduration > bs.bs_dtimperiod)
 			bs.bs_sleepduration = roundup(bs.bs_sleepduration, bs.bs_dtimperiod);
 
@@ -2444,7 +2444,6 @@
 		if (ic->ic_opmode == IEEE80211_M_IBSS && sc->sc_hasveol)
 			ath_beacon_proc(sc, 0);
 	}
-#undef MS_TO_TU
 }
 
 static void