From owner-p4-projects@FreeBSD.ORG  Sat Sep  8 18:33:34 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3A2C016A420; Sat,  8 Sep 2007 18:33:34 +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 F014816A41A
	for <perforce@FreeBSD.org>; Sat,  8 Sep 2007 18:33:33 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D592513C483
	for <perforce@FreeBSD.org>; Sat,  8 Sep 2007 18:33:33 +0000 (UTC)
	(envelope-from zec@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 l88IXXLQ077644
	for <perforce@FreeBSD.org>; Sat, 8 Sep 2007 18:33:33 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l88IXXol077641
	for perforce@freebsd.org; Sat, 8 Sep 2007 18:33:33 GMT
	(envelope-from zec@FreeBSD.org)
Date: Sat, 8 Sep 2007 18:33:33 GMT
Message-Id: <200709081833.l88IXXol077641@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@FreeBSD.org using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 126194 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: Sat, 08 Sep 2007 18:33:34 -0000

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

Change 126194 by zec@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;