1 --- a/net/bridge/br_input.c
2 +++ b/net/bridge/br_input.c
3 @@ -26,6 +26,17 @@ const u8 br_group_address[ETH_ALEN] = {
4 br_should_route_hook_t __rcu *br_should_route_hook __read_mostly;
5 EXPORT_SYMBOL(br_should_route_hook);
8 +BR_HOOK(uint8_t pf, unsigned int hook, struct sk_buff *skb,
9 + struct net_device *in, struct net_device *out,
10 + int (*okfn)(struct sk_buff *))
12 + if (!br_netfilter_run_hooks())
15 + return NF_HOOK(pf, hook, skb, in, out, okfn);
18 static int br_pass_frame_up(struct sk_buff *skb)
20 struct net_device *indev, *brdev = BR_INPUT_SKB_CB(skb)->brdev;
21 @@ -40,7 +51,7 @@ static int br_pass_frame_up(struct sk_bu
25 - return NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL,
26 + return BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL,
30 @@ -194,7 +205,7 @@ rx_handler_result_t br_handle_frame(stru
33 /* Deliver packet to local host only */
34 - if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev,
35 + if (BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev,
36 NULL, br_handle_local_finish)) {
37 return RX_HANDLER_CONSUMED; /* consumed by filter */
39 @@ -219,7 +230,7 @@ forward:
40 if (!compare_ether_addr(p->br->dev->dev_addr, dest))
41 skb->pkt_type = PACKET_HOST;
43 - NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
44 + BR_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
45 br_handle_frame_finish);
48 --- a/net/bridge/br_netfilter.c
49 +++ b/net/bridge/br_netfilter.c
50 @@ -62,6 +62,11 @@ static int brnf_filter_pppoe_tagged __re
51 #define brnf_filter_pppoe_tagged 0
54 +bool br_netfilter_run_hooks(void)
56 + return brnf_call_iptables | brnf_call_ip6tables | brnf_call_arptables;
59 static inline __be16 vlan_proto(const struct sk_buff *skb)
61 if (vlan_tx_tag_present(skb))
62 --- a/net/bridge/br_private.h
63 +++ b/net/bridge/br_private.h
64 @@ -492,10 +492,12 @@ static inline bool br_multicast_is_route
65 extern int br_netfilter_init(void);
66 extern void br_netfilter_fini(void);
67 extern void br_netfilter_rtable_init(struct net_bridge *);
68 +extern bool br_netfilter_run_hooks(void);
70 #define br_netfilter_init() (0)
71 #define br_netfilter_fini() do { } while(0)
72 #define br_netfilter_rtable_init(x)
73 +#define br_netfilter_run_hooks() false