diff options
| author | David S. Miller <davem@davemloft.net> | 2010-07-03 01:42:06 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-03 01:42:06 -0400 |
| commit | e490c1defec4236a6a131fe2d13bf7ba787c02f8 (patch) | |
| tree | 132325ca88cc86a74345a93b2774c5ca284b038a /net/bridge/br_private.h | |
| parent | 0a17d8c744e44617a3c22e7af68b4c5c9c1c5dba (diff) | |
| parent | 4df53d8bab65cf2c18daebd51a5a4847e03f1943 (diff) | |
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 | |||
| 176 | unsigned long feature_mask; | 176 | unsigned long feature_mask; |
| 177 | #ifdef CONFIG_BRIDGE_NETFILTER | 177 | #ifdef CONFIG_BRIDGE_NETFILTER |
| 178 | struct rtable fake_rtable; | 178 | struct rtable fake_rtable; |
| 179 | bool nf_call_iptables; | ||
| 180 | bool nf_call_ip6tables; | ||
| 181 | bool nf_call_arptables; | ||
| 179 | #endif | 182 | #endif |
| 180 | unsigned long flags; | 183 | unsigned long flags; |
| 181 | #define BR_SET_MAC_ADDR 0x00000001 | 184 | #define BR_SET_MAC_ADDR 0x00000001 |