diff options
| author | melifaro <melifaro@FreeBSD.org> | 2012-03-12 15:41:36 +0000 |
|---|---|---|
| committer | melifaro <melifaro@FreeBSD.org> | 2012-03-12 15:41:36 +0000 |
| commit | 45df7d437f0b17d990a154a99f2ae6594dc6dd95 (patch) | |
| tree | 482af21abab023db76744d6f0c4e0ad9e423c89d | |
| parent | 83f08b992d7b94947c9227ccee5bfd038b71eae5 (diff) | |
| download | FreeBSD-src-45df7d437f0b17d990a154a99f2ae6594dc6dd95.zip FreeBSD-src-45df7d437f0b17d990a154a99f2ae6594dc6dd95.tar.gz | |
Fix VNET build broken by r232865.
Temporary remove the ability to assign different number of tables per VNET instance.
| -rw-r--r-- | sys/netinet/ipfw/ip_fw2.c | 2 | ||||
| -rw-r--r-- | sys/netinet/ipfw/ip_fw_private.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/netinet/ipfw/ip_fw2.c b/sys/netinet/ipfw/ip_fw2.c index 74cf463..a678910 100644 --- a/sys/netinet/ipfw/ip_fw2.c +++ b/sys/netinet/ipfw/ip_fw2.c @@ -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). diff --git a/sys/netinet/ipfw/ip_fw_private.h b/sys/netinet/ipfw/ip_fw_private.h index a963380..84d927b 100644 --- a/sys/netinet/ipfw/ip_fw_private.h +++ b/sys/netinet/ipfw/ip_fw_private.h @@ -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 */ |
