PERFORCE change 143221 for review

[Julian Elischer]

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

Change 143221 by julian at julian_trafmon1 on 2008/06/09 22:56:52

	 Compile

Affected files ...

.. //depot/projects/vimage-commit/src/sys/netinet/raw_ip.c#3 edit
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_hostcache.c#3 edit
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_subr.c#3 edit
.. //depot/projects/vimage-commit/src/sys/netinet6/in6_rmx.c#3 edit
.. //depot/projects/vimage-commit/src/sys/netinet6/ip6_input.c#3 edit
.. //depot/projects/vimage-commit/src/sys/netinet6/nd6.c#3 edit
.. //depot/projects/vimage-commit/src/sys/netinet6/nd6_nbr.c#3 edit
.. //depot/projects/vimage-commit/src/sys/netinet6/scope6.c#3 edit

Differences ...

==== //depot/projects/vimage-commit/src/sys/netinet/raw_ip.c#3 (text+ko) ====

@@ -147,7 +147,8 @@
 	    hashinit(1, M_PCB, &V_ripcbinfo.ipi_hashmask);
 	V_ripcbinfo.ipi_porthashbase =
 	    hashinit(1, M_PCB, &V_ripcbinfo.ipi_porthashmask);
-	V_ripcbinfo.ipi_zone = ripcb_zone;
+	V_ripcbinfo.ipi_zone = uma_zcreate("ripcb", sizeof(struct inpcb),
+	    NULL, NULL, rip_inpcb_init, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE);
 	uma_zone_set_max(V_ripcbinfo.ipi_zone, maxsockets);
 	EVENTHANDLER_REGISTER(maxsockets_change, rip_zone_change,
 		NULL, EVENTHANDLER_PRI_ANY);

==== //depot/projects/vimage-commit/src/sys/netinet/tcp_hostcache.c#3 (text+ko) ====

@@ -262,7 +262,7 @@
 	 */
 	callout_init(&V_tcp_hc_callout, CALLOUT_MPSAFE);
 	callout_reset(&V_tcp_hc_callout, V_tcp_hostcache.prune * hz,
-	    tcp_hc_purge, curvnet);
+	    tcp_hc_purge, 0);
 }
 
 /*

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

@@ -287,7 +287,9 @@
 	    &V_tcbinfo.ipi_hashmask);
 	V_tcbinfo.ipi_porthashbase = hashinit(hashsize, M_PCB,
 	    &V_tcbinfo.ipi_porthashmask);
-	V_tcbinfo.ipi_zone = tcp_ipi_zone;
+	V_tcbinfo.ipi_zone = uma_zcreate("inpcb", sizeof(struct inpcb),
+	    NULL, NULL, tcp_inpcb_init, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE);
+	uma_zone_set_max(V_tcbinfo.ipi_zone, maxsockets);
 #ifdef INET6
 #define TCP_MINPROTOHDR (sizeof(struct ip6_hdr) + sizeof(struct tcphdr))
 #else /* INET6 */

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

@@ -324,8 +324,8 @@
 }
 
 #define RTQ_TIMEOUT	60*10	/* run no less than once every ten minutes */
-static int rtq_timeout = RTQ_TIMEOUT;
-static struct callout rtq_timer;
+static int rtq_timeout6 = RTQ_TIMEOUT;
+static struct callout rtq_timer6;
 
 static void
 in6_rtqtimo(void *rock)

==== //depot/projects/vimage-commit/src/sys/netinet6/ip6_input.c#3 (text+ko) ====

@@ -197,14 +197,14 @@
 
 	/* nd6_timer_init */
 	callout_init(&V_nd6_timer_ch, 0);
-	callout_reset(&V_nd6_timer_ch, hz, nd6_timer, curvnet);
+	callout_reset(&V_nd6_timer_ch, hz, nd6_timer, NULL);
 
 	/* timer for regeneranation of temporary addresses randomize ID */
 	callout_init(&V_in6_tmpaddrtimer_ch, 0);
 	callout_reset(&V_in6_tmpaddrtimer_ch,
 		      (V_ip6_temp_preferred_lifetime - V_ip6_desync_factor -
 		       V_ip6_temp_regen_advance) * hz,
-		      in6_tmpaddrtimer, curvnet);
+		      in6_tmpaddrtimer, NULL);
 }
 
 /* cheat */

==== //depot/projects/vimage-commit/src/sys/netinet6/nd6.c#3 (text+ko) ====

@@ -144,7 +144,7 @@
 	/* start timer */
 	callout_init(&V_nd6_slowtimo_ch, 0);
 	callout_reset(&V_nd6_slowtimo_ch, ND6_SLOWTIMER_INTERVAL * hz,
-	    nd6_slowtimo, curvnet);
+	    nd6_slowtimo, NULL);
 
 	nd6_init_done = 1;
 

==== //depot/projects/vimage-commit/src/sys/netinet6/nd6_nbr.c#3 (text+ko) ====

@@ -1068,6 +1068,7 @@
 	}
 }
 
+TAILQ_HEAD(dadq_head, dadq);
 struct dadq {
 	TAILQ_ENTRY(dadq) dad_list;
 	struct ifaddr *dad_ifa;
@@ -1101,7 +1102,7 @@
 {
 
 	callout_reset(&dp->dad_timer_ch, ticks,
-	    (void (*)(void *))nd6_dad_timer, (void *)dp);
+	    (void (*)(void *))nd6_dad_timer, (void *)dp->dad_ifa);
 }
 
 static void
@@ -1220,7 +1221,7 @@
 }
 
 static void
-nd6_dad_timer(struct dadq *dp)
+nd6_dad_timer(struct ifaddr *ifa)
 {
 	int s;
 	CURVNET_SET(dp->dad_vnet);

==== //depot/projects/vimage-commit/src/sys/netinet6/scope6.c#3 (text+ko) ====

@@ -49,6 +49,7 @@
 #include <netinet/in.h>
 
 #include <netinet6/in6_var.h>
+#include <netinet/ip6.h>
 #include <netinet6/scope6_var.h>
 
 #ifdef ENABLE_DEFAULT_SCOPE