From owner-svn-src-all@FreeBSD.ORG  Wed Apr 20 07:55:33 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AD212106564A;
	Wed, 20 Apr 2011 07:55:33 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9BFC78FC0A;
	Wed, 20 Apr 2011 07:55:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p3K7tX6K037288;
	Wed, 20 Apr 2011 07:55:33 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3K7tX8R037285;
	Wed, 20 Apr 2011 07:55:33 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201104200755.p3K7tX8R037285@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Wed, 20 Apr 2011 07:55:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220878 - in head/sys/netinet: . ipfw
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Apr 2011 07:55:33 -0000

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).