PERFORCE change 147639 for review

[Bjoern A. Zeeb]

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

Change 147639 by bz at 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