From owner-p4-projects@FreeBSD.ORG  Sun Aug 17 12:19:01 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D15EA106568D; Sun, 17 Aug 2008 12:19: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 952B01065680
	for <perforce@freebsd.org>; Sun, 17 Aug 2008 12:19: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 80B388FC1B
	for <perforce@freebsd.org>; Sun, 17 Aug 2008 12:19: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 m7HCJ0mK004066
	for <perforce@freebsd.org>; Sun, 17 Aug 2008 12:19:00 GMT
	(envelope-from bz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7HCJ0QW004064
	for perforce@freebsd.org; Sun, 17 Aug 2008 12:19:00 GMT
	(envelope-from bz@freebsd.org)
Date: Sun, 17 Aug 2008 12:19:00 GMT
Message-Id: <200808171219.m7HCJ0QW004064@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 147639 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 12:19:01 -0000

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

Change 147639 by bz@bz_dumpster on 2008/08/17 12:18:47

	GC a dead global,
	more V_

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#9 edit
.. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#10 edit

Differences ...

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

@@ -4579,17 +4579,17 @@
 		printf("limited to %d packets/entry by default\n",
 		    verbose_limit);
 
-	error = init_tables(&layer3_chain);
+	error = init_tables(&V_layer3_chain);
 	if (error) {
 		IPFW_DYN_LOCK_DESTROY();
-		IPFW_LOCK_DESTROY(&layer3_chain);
+		IPFW_LOCK_DESTROY(&V_layer3_chain);
 		uma_zdestroy(ipfw_dyn_rule_zone);
 		return (error);
 	}
 	ip_fw_ctl_ptr = ipfw_ctl;
 	ip_fw_chk_ptr = ipfw_chk;
 	callout_reset(&V_ipfw_timeout, hz, ipfw_tick, NULL);	
-	LIST_INIT(&layer3_chain.nat);
+	LIST_INIT(&V_layer3_chain.nat);
 	return (0);
 }
 
@@ -4601,10 +4601,10 @@
 	ip_fw_chk_ptr = NULL;
 	ip_fw_ctl_ptr = NULL;
 	callout_drain(&V_ipfw_timeout);
-	IPFW_WLOCK(&layer3_chain);
-	flush_tables(&layer3_chain);
-	layer3_chain.reap = NULL;
-	free_chain(&layer3_chain, 1 /* kill default rule */);
+	IPFW_WLOCK(&V_layer3_chain);
+	flush_tables(&V_layer3_chain);
+	V_layer3_chain.reap = NULL;
+	free_chain(&V_layer3_chain, 1 /* kill default rule */);
 	reap = V_layer3_chain.reap, V_layer3_chain.reap = NULL;
 	IPFW_WUNLOCK(&V_layer3_chain);
 	if (reap != NULL)

==== //depot/projects/vimage-commit2/src/sys/sys/vimage.h#10 (text+ko) ====

@@ -210,7 +210,6 @@
 #define	V_key_blockacq_lifetime key_blockacq_lifetime
 #define	V_key_cb key_cb
 #define	V_key_debug_level key_debug_level
-#define	V_key_dst key_dst
 #define	V_key_int_random key_int_random
 #define	V_key_larval_lifetime key_larval_lifetime
 #define	V_key_preferred_oldsa key_preferred_oldsa