PERFORCE change 141634 for review

Julian Elischer julian at FreeBSD.org
Thu May 15 07:33:29 UTC 2008


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

Change 141634 by julian at 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;
 


More information about the p4-projects mailing list