PERFORCE change 126194 for review

[Marko Zec]

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

Change 126194 by zec at zec_tpx32 on 2007/09/08 18:32:57

	Rename ip6_test_init() to ip6_dom_init() and unwrap it from
	#ifdef VIMAGE, since it's necessary to initialize the
	variables in a non-VIMAGE kernels as well.
	
	While here, remove two (probably stale) debugging printf()-s.

Affected files ...

.. //depot/projects/vimage/src/sys/netinet6/in6_proto.c#19 edit
.. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#23 edit

Differences ...

==== //depot/projects/vimage/src/sys/netinet6/in6_proto.c#19 (text+ko) ====

@@ -590,13 +590,11 @@
 SYSCTL_V_INT(V_NET, vnet_inet6, _net_inet6_icmp6, ICMPV6CTL_ND6_DEBUG,
 	nd6_debug, CTLFLAG_RW,	nd6_debug,		0, "");
 
-#ifdef VIMAGE
 static void
-ip6_test_init(void)
+ip6_dom_init(void)
 {
 	INIT_VNET_INET6(curvnet);
 
-	printf("---> ip6_test_init() \n");
 	V_ip6_forwarding = IPV6FORWARDING;    /* act as router? */
 	V_ip6_sendredirects = IPV6_SENDREDIRECTS;
 	V_ip6_defhlim = IPV6_DEFHLIM;
@@ -639,7 +637,6 @@
                     /* 40 1K datagrams */
 
 }
-#endif
 
 struct domain inet6domain = {
         .dom_family =           AF_INET6,
@@ -655,9 +652,7 @@
         .dom_maxrtkey =         sizeof(struct sockaddr_in6),
         .dom_ifattach =         in6_domifattach,
         .dom_ifdetach =         in6_domifdetach,
-#ifdef VIMAGE
-        .dom_init =             ip6_test_init
-#endif
+        .dom_init =             ip6_dom_init
 };
 
 DOMAIN_SET(inet6);

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

@@ -166,7 +166,6 @@
 void
 ip6_init(void)
 {
-	printf("---> ip6_init() \n");
 	INIT_VNET_INET6(curvnet);
 	struct ip6protosw *pr;
 	int i;