Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[~andy/linux] / net / bridge / br_private.h

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 3f0678fd1fd02c03613267d8bd33a1cb234f5f84..75c90edaf7db097432dd959069ed043a89d03262 100644 (file)
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -176,6 +176,9 @@ struct net_bridge
        unsigned long                   feature_mask;
 #ifdef CONFIG_BRIDGE_NETFILTER
        struct rtable                   fake_rtable;
+       bool                            nf_call_iptables;
+       bool                            nf_call_ip6tables;
+       bool                            nf_call_arptables;
 #endif
        unsigned long                   flags;
 #define BR_SET_MAC_ADDR                0x00000001