diff options
| author |   Patrick McHardy <kaber@trash.net> | 2006-07-24 22:54:55 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2006-07-24 22:54:55 -0700 |
| commit | 10ea6ac895418bd0d23900e3330daa6ba0836d26 (patch) | |
| tree | 299c04f0a248bf2432f1d729f792221c7ed26515 /net/bridge | |
| parent | [NETFILTER]: xt_pkttype: fix mismatches on locally generated packets (diff) | |
| download | linux-dev-10ea6ac895418bd0d23900e3330daa6ba0836d26.tar.xz linux-dev-10ea6ac895418bd0d23900e3330daa6ba0836d26.zip | |
[NETFILTER]: bridge netfilter: add deferred output hooks to feature-removal-schedule
Add bridge netfilter deferred output hooks to feature-removal-schedule
and disable them by default. Until their removal they will be
activated by the physdev match when needed.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_netfilter.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c index cbc8a389a0a8..05b3de888243 100644 --- a/net/bridge/br_netfilter.c +++ b/net/bridge/br_netfilter.c @@ -61,6 +61,9 @@ static int brnf_filter_vlan_tagged = 1; #define brnf_filter_vlan_tagged 1 #endif +int brnf_deferred_hooks; +EXPORT_SYMBOL_GPL(brnf_deferred_hooks); + static __be16 inline vlan_proto(const struct sk_buff *skb) { return vlan_eth_hdr(skb)->h_vlan_encapsulated_proto; @@ -890,6 +893,8 @@ static unsigned int ip_sabotage_out(unsigned int hook, struct sk_buff **pskb, return NF_ACCEPT; else if (ip->version == 6 && !brnf_call_ip6tables) return NF_ACCEPT; + else if (!brnf_deferred_hooks) + return NF_ACCEPT; #endif if (hook == NF_IP_POST_ROUTING) return NF_ACCEPT; |