From owner-p4-projects@FreeBSD.ORG  Thu May 15 07:33:29 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E77AF10656B8; Thu, 15 May 2008 07:33:28 +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 A6EC3106567D
	for <perforce@freebsd.org>; Thu, 15 May 2008 07:33:28 +0000 (UTC)
	(envelope-from julian@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 963C48FC12
	for <perforce@freebsd.org>; Thu, 15 May 2008 07:33:28 +0000 (UTC)
	(envelope-from julian@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 m4F7XSBS019953
	for <perforce@freebsd.org>; Thu, 15 May 2008 07:33:28 GMT
	(envelope-from julian@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4F7XSHI019951
	for perforce@freebsd.org; Thu, 15 May 2008 07:33:28 GMT
	(envelope-from julian@freebsd.org)
Date: Thu, 15 May 2008 07:33:28 GMT
Message-Id: <200805150733.m4F7XSHI019951@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	julian@freebsd.org using -f
From: Julian Elischer <julian@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 141634 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: Thu, 15 May 2008 07:33:29 -0000

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

Change 141634 by julian@julian_trafmon1 on 2008/05/15 07:32:32

	 still wrong, bit need to sleep

Affected files ...

.. //depot/projects/vimage/src/sys/netinet/in_rmx.c#11 edit

Differences ...

==== //depot/projects/vimage/src/sys/netinet/in_rmx.c#11 (text+ko) ====

@@ -281,23 +281,24 @@
 	CURVNET_SET_QUIET((struct vnet *) rock);
 	INIT_VNET_NET((struct vnet *) rock);
 	INIT_VNET_INET((struct vnet *) rock);
-	struct radix_node_head *rnh = V_rt_tables[AF_INET];
 	struct timeval atv;
 
 	KASSERT((rock == (void *)rt_tables[0][AF_INET]),
 			("in_rtqtimo: unexpected arg"));
 	for (fibnum = 0; fibnum < rt_numfibs; fibnum++) {
-		if ((newrock = rt_tables[fibnum][AF_INET]) != NULL)
+		if ((newrock = V_rt_tables[fibnum][AF_INET]) != NULL)
 			in_rtqtimo_one(newrock);
 	}
 	atv.tv_usec = 0;
 	atv.tv_sec = V_rtq_timeout;
 	callout_reset(&V_rtq_timer, tvtohz(&atv), in_rtqtimo, rock);
+	CURVNET_RESTORE();
 }
 
 static void
-in_rtqtimo_one(void *rock)
+in_rtqtimo_one(void *rnh)
 {
+	INIT_VNET_NET(curvnet);
 	struct rtqk_arg arg;
 	static time_t last_adjusted_timeout = 0;