PERFORCE change 161120 for review

Marko Zec zec at FreeBSD.org
Sun Apr 26 18:12:12 UTC 2009


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

Change 161120 by zec at zec_amdx2 on 2009/04/26 18:12:08

	Attempt at integ vimage-commit -> vimage-commit2

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_socket.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#18 integrate
.. //depot/projects/vimage-commit2/src/sys/net/route.c#35 integrate
.. //depot/projects/vimage-commit2/src/sys/net/rtsock.c#23 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#26 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/in.c#24 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/in_mcast.c#21 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#26 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_divert.c#27 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#40 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_mroute.c#14 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#48 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#24 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#35 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#28 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#25 integrate

Differences ...

==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_socket.c#13 (text+ko) ====


==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#18 (text+ko) ====


==== //depot/projects/vimage-commit2/src/sys/net/route.c#35 (text+ko) ====


==== //depot/projects/vimage-commit2/src/sys/net/rtsock.c#23 (text+ko) ====


==== //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#26 (text+ko) ====

@@ -3626,10 +3626,6 @@
  * be registered with VNET_MOD_INET, not here.  Revisit!!!
  */
 #if 0
-static struct vnet_symmap vnet_igmp_symmap[] = {
-	VNET_SYMMAP(igmp, igi_head),
-	VNET_SYMMAP(igmp, igmpstat),
-	VNET_SYMMAP_END
 };
 #endif
 

==== //depot/projects/vimage-commit2/src/sys/netinet/in.c#24 (text+ko) ====


==== //depot/projects/vimage-commit2/src/sys/netinet/in_mcast.c#21 (text+ko) ====


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

@@ -250,8 +250,8 @@
 static void
 in_rtqtimo(void *rock)
 {
-	INIT_VNET_NET(curvnet);		/* XXX revisit!!! */
-	INIT_VNET_INET(curvnet);	/* XXX revisit!!! */
+	INIT_VNET_NET(curvnet);
+	INIT_VNET_INET(curvnet);
 	int fibnum;
 	void *newrock;
 	struct timeval atv;

==== //depot/projects/vimage-commit2/src/sys/netinet/ip_divert.c#27 (text+ko) ====


==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#40 (text+ko) ====


==== //depot/projects/vimage-commit2/src/sys/netinet/ip_mroute.c#14 (text+ko) ====


==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#48 (text+ko) ====


==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#24 (text+ko) ====


==== //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#35 (text+ko) ====


==== //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#28 (text+ko) ====

@@ -288,8 +288,8 @@
 static void
 in6_rtqtimo(void *rock)
 {
-	CURVNET_SET_QUIET((struct vnet *) rock); /* XXX revisit ! */
-	INIT_VNET_INET6(curvnet); /* XXX revisit ! */
+	CURVNET_SET_QUIET((struct vnet *) rock);
+	INIT_VNET_INET6(curvnet);
 	struct radix_node_head *rnh = rock;
 	struct rtqk_arg arg;
 	struct timeval atv;
@@ -375,8 +375,8 @@
 static void
 in6_mtutimo(void *rock)
 {
-	CURVNET_SET_QUIET((struct vnet *) rock); /* XXX revisit! */
-	INIT_VNET_INET6(curvnet); /* XXX revisit! */
+	CURVNET_SET_QUIET((struct vnet *) rock);
+	INIT_VNET_INET6(curvnet);
 	struct radix_node_head *rnh = rock;
 	struct mtuex_arg arg;
 	struct timeval atv;

==== //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#25 (text+ko) ====



More information about the p4-projects mailing list