From owner-svn-src-head@FreeBSD.ORG  Mon Mar 12 15:41:37 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 2471C1065675;
	Mon, 12 Mar 2012 15:41:37 +0000 (UTC)
	(envelope-from melifaro@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1365E8FC08;
	Mon, 12 Mar 2012 15:41:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2CFfaEe071070;
	Mon, 12 Mar 2012 15:41:36 GMT
	(envelope-from melifaro@svn.freebsd.org)
Received: (from melifaro@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2CFfa5G071067;
	Mon, 12 Mar 2012 15:41:36 GMT
	(envelope-from melifaro@svn.freebsd.org)
Message-Id: <201203121541.q2CFfa5G071067@svn.freebsd.org>
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Date: Mon, 12 Mar 2012 15:41:36 +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: r232868 - head/sys/netinet/ipfw
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Mar 2012 15:41:37 -0000

Author: melifaro
Date: Mon Mar 12 15:41:36 2012
New Revision: 232868
URL: http://svn.freebsd.org/changeset/base/232868

Log:
  Fix VNET build broken by r232865.
  Temporary remove the ability to assign different number of tables per VNET instance.

Modified:
  head/sys/netinet/ipfw/ip_fw2.c
  head/sys/netinet/ipfw/ip_fw_private.h

Modified: head/sys/netinet/ipfw/ip_fw2.c
==============================================================================
--- head/sys/netinet/ipfw/ip_fw2.c	Mon Mar 12 15:13:17 2012	(r232867)
+++ head/sys/netinet/ipfw/ip_fw2.c	Mon Mar 12 15:41:36 2012	(r232868)
@@ -117,7 +117,7 @@ VNET_DEFINE(int, autoinc_step);
 VNET_DEFINE(int, fw_one_pass) = 1;
 
 /* Use 128 tables by default */
-VNET_DEFINE(int, fw_tables_max) = IPFW_TABLES_MAX;
+int fw_tables_max = IPFW_TABLES_MAX;
 
 /*
  * Each rule belongs to one of 32 different sets (0..31).

Modified: head/sys/netinet/ipfw/ip_fw_private.h
==============================================================================
--- head/sys/netinet/ipfw/ip_fw_private.h	Mon Mar 12 15:13:17 2012	(r232867)
+++ head/sys/netinet/ipfw/ip_fw_private.h	Mon Mar 12 15:41:36 2012	(r232868)
@@ -209,8 +209,8 @@ VNET_DECLARE(u_int32_t, set_disable);
 VNET_DECLARE(int, autoinc_step);
 #define V_autoinc_step		VNET(autoinc_step)
 
-VNET_DECLARE(int, fw_tables_max);
-#define V_fw_tables_max		VNET(fw_tables_max)
+extern int fw_tables_max;
+#define V_fw_tables_max		fw_tables_max
 
 struct ip_fw_chain {
 	struct ip_fw	*rules;		/* list of rules */