Date: Mon, 12 Mar 2012 15:41:36 +0000 (UTC) From: "Alexander V. Chernikov" <melifaro@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r232868 - head/sys/netinet/ipfw Message-ID: <201203121541.q2CFfa5G071067@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203121541.q2CFfa5G071067>