From owner-p4-projects@FreeBSD.ORG  Mon Nov 10 19:48:18 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 60560106567E; Mon, 10 Nov 2008 19:48:18 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 24793106567B
	for <perforce@freebsd.org>; Mon, 10 Nov 2008 19:48:18 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 11C258FC18
	for <perforce@freebsd.org>; Mon, 10 Nov 2008 19:48:18 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAAJmIg7015281
	for <perforce@freebsd.org>; Mon, 10 Nov 2008 19:48:18 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAAJmIxp015279
	for perforce@freebsd.org; Mon, 10 Nov 2008 19:48:18 GMT
	(envelope-from sam@freebsd.org)
Date: Mon, 10 Nov 2008 19:48:18 GMT
Message-Id: <200811101948.mAAJmIxp015279@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>
Cc: 
Subject: PERFORCE change 152758 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Mon, 10 Nov 2008 19:48:18 -0000

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

Change 152758 by sam@sam_ebb on 2008/11/10 19:47:39

	allow setting the cal interval to 0 to disable periodic cals
	for testing

Affected files ...

.. //depot/projects/vap/sys/dev/ath/if_ath.c#122 edit

Differences ...

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

@@ -5582,15 +5582,22 @@
 		if (sc->sc_calinterval > ath_calinterval)
 			sc->sc_calinterval = ath_calinterval;
 	}
-	KASSERT(0 < sc->sc_calinterval && sc->sc_calinterval <= ath_calinterval,
+	KASSERT(0 <= sc->sc_calinterval &&
+	    sc->sc_calinterval <= ath_calinterval,
 		("bad calibration interval %u", sc->sc_calinterval));
 
-	DPRINTF(sc, ATH_DEBUG_CALIBRATE,
-		"%s: next +%u (%siqCalDone tries %u)\n", __func__,
-		sc->sc_calinterval, iqCalDone ? "" : "!", sc->sc_caltries);
-	sc->sc_caltries++;
-	callout_reset(&sc->sc_cal_ch, sc->sc_calinterval * hz,
-		ath_calibrate, sc);
+	if (ath_calinterval != 0) {
+		DPRINTF(sc, ATH_DEBUG_CALIBRATE,
+		    "%s: next +%u (%siqCalDone tries %u)\n", __func__,
+		    sc->sc_calinterval, iqCalDone ? "" : "!", sc->sc_caltries);
+		sc->sc_caltries++;
+		callout_reset(&sc->sc_cal_ch, sc->sc_calinterval * hz,
+			ath_calibrate, sc);
+	} else {
+		DPRINTF(sc, ATH_DEBUG_CALIBRATE, "%s: calibration disabled\n",
+		    __func__);
+		/* NB: don't rearm timer */
+	}
 }
 
 static void