svn commit: r220878 - in head/sys/netinet: . ipfw

[Bjoern A. Zeeb]

Author: bz
Date: Wed Apr 20 07:55:33 2011
New Revision: 220878
URL: http://svn.freebsd.org/changeset/base/220878

Log:
  MFp4 CH=191466:
  
  Move fw_one_pass to where it belongs: it is a property of ipfw,
  not of ip_input.
  
  Reviewed by:	gnn
  Sponsored by:	The FreeBSD Foundation
  Sponsored by:	iXsystems
  MFC after:	3 days

Modified:
  head/sys/netinet/ip_input.c
  head/sys/netinet/ipfw/ip_fw2.c

Modified: head/sys/netinet/ip_input.c
==============================================================================
--- head/sys/netinet/ip_input.c	Wed Apr 20 01:15:22 2011	(r220877)
+++ head/sys/netinet/ip_input.c	Wed Apr 20 07:55:33 2011	(r220878)
@@ -218,8 +218,6 @@ SYSCTL_VNET_INT(_net_inet_ip, OID_AUTO, 
     "number of entries in the per-cpu output flow caches");
 #endif
 
-VNET_DEFINE(int, fw_one_pass) = 1;
-
 static void	ip_freef(struct ipqhead *, struct ipq *);
 
 /*

Modified: head/sys/netinet/ipfw/ip_fw2.c
==============================================================================
--- head/sys/netinet/ipfw/ip_fw2.c	Wed Apr 20 01:15:22 2011	(r220877)
+++ head/sys/netinet/ipfw/ip_fw2.c	Wed Apr 20 07:55:33 2011	(r220878)
@@ -113,6 +113,7 @@ static int default_to_accept;
 #endif
 
 VNET_DEFINE(int, autoinc_step);
+VNET_DEFINE(int, fw_one_pass) = 1;
 
 /*
  * Each rule belongs to one of 32 different sets (0..31).