add a warning and tell users to set call_iptables to 0 or 1
depending on desired behaviour before adding ports to the bridge.
In distant future, this might allow to disable call_iptables by default.
Signed-off-by: Florian Westphal <fw@xxxxxxxxx>
---
no changes since v1.
net/bridge/br_netfilter.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index 52c410f..e0b581d 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -58,9 +58,9 @@ static int brnf_filter_vlan_tagged __read_mostly = 0;
static int brnf_filter_pppoe_tagged __read_mostly = 0;
static int brnf_pass_vlan_indev __read_mostly = 0;
-int brnf_call_iptables __read_mostly = 1;
-int brnf_call_ip6tables __read_mostly = 1;
-int brnf_call_arptables __read_mostly = 1;
+int brnf_call_iptables __read_mostly = 2;
+int brnf_call_ip6tables __read_mostly = 2;
+int brnf_call_arptables __read_mostly = 2;
#else
#define brnf_filter_vlan_tagged 0
#define brnf_filter_pppoe_tagged 0
@@ -1075,6 +1075,12 @@ static void __br_register_hooks_init(struct work_struct *w)
return;
}
static_key_slow_inc(&brnf_hooks_active);
+
+ if ((brnf_call_iptables|brnf_call_ip6tables|brnf_call_arptables) == 2)
+ pr_info("bridge: automatic filtering via arp/ip/ip6tables "
+ "is deprecated and it will be disabled soon. Set "
+ "bridge-nf-call-{ip,ip6,arp}tables sysctls to 1 or 0 "
+ "before adding bridge ports if you need this.\n");
}
bool br_netfiler_hooks_init(void)
--
1.8.1.5
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
