diff options
| author | David S. Miller | 2010-07-03 07:42:06 +0200 |
|---|---|---|
| committer | David S. Miller | 2010-07-03 07:42:06 +0200 |
| commit | e490c1defec4236a6a131fe2d13bf7ba787c02f8 (patch) | |
| tree | 132325ca88cc86a74345a93b2774c5ca284b038a /net/bridge/br_private.h | |
| parent | ixgbe: use NETIF_F_LRO (diff) | |
| parent | bridge: add per bridge device controls for invoking iptables (diff) | |
| download | kernel-qcow2-linux-e490c1defec4236a6a131fe2d13bf7ba787c02f8.tar.gz kernel-qcow2-linux-e490c1defec4236a6a131fe2d13bf7ba787c02f8.tar.xz kernel-qcow2-linux-e490c1defec4236a6a131fe2d13bf7ba787c02f8.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'net/bridge/br_private.h')
| -rw-r--r-- | net/bridge/br_private.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index 3f0678fd1fd0..75c90edaf7db 100644 --- 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 |