From owner-p4-projects@FreeBSD.ORG  Sun Jun 29 06:03:33 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9AEF9106567B; Sun, 29 Jun 2008 06:03:33 +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 5CB30106566B
	for <perforce@freebsd.org>; Sun, 29 Jun 2008 06:03:33 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4D8C78FC0C
	for <perforce@freebsd.org>; Sun, 29 Jun 2008 06:03:33 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5T63Xe7088226
	for <perforce@freebsd.org>; Sun, 29 Jun 2008 06:03:33 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5T63XoZ088224
	for perforce@freebsd.org; Sun, 29 Jun 2008 06:03:33 GMT
	(envelope-from jb@freebsd.org)
Date: Sun, 29 Jun 2008 06:03:33 GMT
Message-Id: <200806290603.m5T63XoZ088224@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 144259 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: Sun, 29 Jun 2008 06:03:33 -0000

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

Change 144259 by jb@freebsd3 on 2008/06/29 06:02:47

	IFC

Affected files ...

.. //depot/projects/dtrace/src/sys/netinet6/in6_rmx.c#10 integrate

Differences ...

==== //depot/projects/dtrace/src/sys/netinet6/in6_rmx.c#10 (text+ko) ====

@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet6/in6_rmx.c,v 1.22 2008/06/29 00:17:45 julian Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet6/in6_rmx.c,v 1.23 2008/06/29 04:33:45 kan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -321,8 +321,8 @@
 }
 
 #define RTQ_TIMEOUT	60*10	/* run no less than once every ten minutes */
-static int rtq_timeoutt = RTQ_TIMEOUT;
-static struct callout rtq-timer6;
+static int rtq_timeout6 = RTQ_TIMEOUT;
+static struct callout rtq_timer6;
 
 static void
 in6_rtqtimo(void *rock)
@@ -370,7 +370,7 @@
 
 	atv.tv_usec = 0;
 	atv.tv_sec = arg.nextstop - time_uptime;
-	callout_reset(&rtq-timer6, tvtohz(&atv), in6_rtqtimo, rock);
+	callout_reset(&rtq_timer6, tvtohz(&atv), in6_rtqtimo, rock);
 }
 
 /*
@@ -469,7 +469,7 @@
 	rnh->rnh_addaddr = in6_addroute;
 	rnh->rnh_matchaddr = in6_matroute;
 	rnh->rnh_close = in6_clsroute;
-	callout_init(&rtq-timer6, CALLOUT_MPSAFE);
+	callout_init(&rtq_timer6, CALLOUT_MPSAFE);
 	in6_rtqtimo(rnh);	/* kick off timeout first time */
 	callout_init(&rtq_mtutimer, CALLOUT_MPSAFE);
 	in6_mtutimo(rnh);	/* kick off timeout first time */