On 12.03.2012 21:17, Marko Zec wrote:
On Monday 12 March 2012 16:41:36 Alexander V. Chernikov wrote:
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.
Please don't let your code remain in this state for too long. You've declared
V_fw_tables_max to unconditionally resolve to a true global variable, which
violates the convention of using V_ prefix in networking code exclusively for
the purpose of denoting VNET-virtualized state.
I understand this. I plan to change it to normal state today or
tomorrow. Is this OK?
Thanks for noting.
Thanks,
Marko
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 */
--
WBR, Alexander
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
