From owner-p4-projects@FreeBSD.ORG  Fri Aug  1 17:40:43 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A881610656A2; Fri,  1 Aug 2008 17:40:43 +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 6CB98106569E
	for <perforce@freebsd.org>; Fri,  1 Aug 2008 17:40:43 +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 59F9D8FC12
	for <perforce@freebsd.org>; Fri,  1 Aug 2008 17:40:43 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m71Heg3m035059
	for <perforce@freebsd.org>; Fri, 1 Aug 2008 17:40:42 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m71HedW2035056
	for perforce@freebsd.org; Fri, 1 Aug 2008 17:40:39 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 1 Aug 2008 17:40:39 GMT
Message-Id: <200808011740.m71HedW2035056@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 146384 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: Fri, 01 Aug 2008 17:40:43 -0000

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

Change 146384 by sam@sam_ebb on 2008/08/01 17:40:05

	schedule the correct timer when receiving a radar event during CAC

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_dfs.c#6 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_dfs.c#6 (text+ko) ====

@@ -302,7 +302,7 @@
 		announce_radar(ic->ic_ifp, chan, dfs->newchan);
 
 		if (callout_pending(&dfs->cac_timer))
-			callout_reset(&dfs->nol_timer, 0, dfs_timeout, ic);
+			callout_schedule(&dfs->cac_timer, 0);
 		else if (dfs->newchan != NULL) {
 			/* XXX mode 1, switch count 2 */
 			/* XXX calculate switch count based on max