From owner-p4-projects@FreeBSD.ORG  Sun Aug 17 01:32:00 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 97116106567C; Sun, 17 Aug 2008 01:32:00 +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 5A0101065679
	for <perforce@freebsd.org>; Sun, 17 Aug 2008 01:32:00 +0000 (UTC)
	(envelope-from bz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 45C2A8FC15
	for <perforce@freebsd.org>; Sun, 17 Aug 2008 01:32:00 +0000 (UTC)
	(envelope-from bz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7H1VxJO019746
	for <perforce@freebsd.org>; Sun, 17 Aug 2008 01:31:59 GMT
	(envelope-from bz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7H1VxSK019744
	for perforce@freebsd.org; Sun, 17 Aug 2008 01:31:59 GMT
	(envelope-from bz@freebsd.org)
Date: Sun, 17 Aug 2008 01:31:59 GMT
Message-Id: <200808170131.m7H1VxSK019744@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bz@freebsd.org using -f
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 147625 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: Sun, 17 Aug 2008 01:32:00 -0000

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

Change 147625 by bz@bz_dumpster on 2008/08/17 01:30:58

	move V_ missing; down to V_k* && halt -p

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#8 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_pcb.c#9 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#6 edit

Differences ...

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

@@ -4588,7 +4588,7 @@
 	}
 	ip_fw_ctl_ptr = ipfw_ctl;
 	ip_fw_chk_ptr = ipfw_chk;
-	callout_reset(&ipfw_timeout, hz, ipfw_tick, NULL);	
+	callout_reset(&V_ipfw_timeout, hz, ipfw_tick, NULL);	
 	LIST_INIT(&layer3_chain.nat);
 	return (0);
 }
@@ -4600,7 +4600,7 @@
 
 	ip_fw_chk_ptr = NULL;
 	ip_fw_ctl_ptr = NULL;
-	callout_drain(&ipfw_timeout);
+	callout_drain(&V_ipfw_timeout);
 	IPFW_WLOCK(&layer3_chain);
 	flush_tables(&layer3_chain);
 	layer3_chain.reap = NULL;

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

@@ -2784,8 +2784,8 @@
 			first = MODULE_GLOBAL(MOD_INET, ipport_lowfirstauto);
 			last = MODULE_GLOBAL(MOD_INET, ipport_lowlastauto);
 		} else {
-			first = ipport_firstauto;
-			last = ipport_lastauto;
+			first = MODULE_GLOBAL(MOD_INET, ipport_firstauto);
+			last = MODULE_GLOBAL(MOD_INET, ipport_lastauto);
 		}
 		if (first > last) {
 			uint16_t temp;

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

@@ -621,7 +621,7 @@
 	if (V_ip6_forwarding || !V_ip6_accept_rtadv) {
 		nd6log((LOG_WARNING,
 		    "defrouter_select: called unexpectedly (forwarding=%d, "
-		    "accept_rtadv=%d)\n", ip6_forwarding, V_ip6_accept_rtadv));
+		    "accept_rtadv=%d)\n", V_ip6_forwarding, V_ip6_accept_rtadv));
 		splx(s);
 		return;
 	}