target/linux/generic/patches-3.2/644-bridge_optimize_netfilter_hooks.patch

   1 --- a/net/bridge/br_netfilter.c
   2 +++ b/net/bridge/br_netfilter.c
   3 @@ -62,6 +62,11 @@ static int brnf_filter_pppoe_tagged __re
   4  #define brnf_filter_pppoe_tagged 0
   5  #endif
   6
   7 +bool br_netfilter_run_hooks(void)
   8 +{
   9 +       return brnf_call_iptables | brnf_call_ip6tables | brnf_call_arptables;
  10 +}
  11 +
  12  static inline __be16 vlan_proto(const struct sk_buff *skb)
  13  {
  14         if (vlan_tx_tag_present(skb))
  15 --- a/net/bridge/br_private.h
  16 +++ b/net/bridge/br_private.h
  17 @@ -491,10 +491,12 @@ static inline bool br_multicast_is_route
  18  extern int br_netfilter_init(void);
  19  extern void br_netfilter_fini(void);
  20  extern void br_netfilter_rtable_init(struct net_bridge *);
  21 +extern bool br_netfilter_run_hooks(void);
  22  #else
  23  #define br_netfilter_init()    (0)
  24  #define br_netfilter_fini()    do { } while(0)
  25  #define br_netfilter_rtable_init(x)
  26 +#define br_netfilter_run_hooks()       false
  27  #endif
  28
  29  /* br_stp.c */
  30 --- a/net/bridge/br_input.c
  31 +++ b/net/bridge/br_input.c
  32 @@ -26,6 +26,17 @@ const u8 br_group_address[ETH_ALEN] = {
  33  br_should_route_hook_t __rcu *br_should_route_hook __read_mostly;
  34  EXPORT_SYMBOL(br_should_route_hook);
  35
  36 +static inline int
  37 +BR_HOOK(uint8_t pf, unsigned int hook, struct sk_buff *skb,
  38 +       struct net_device *in, struct net_device *out,
  39 +       int (*okfn)(struct sk_buff *))
  40 +{
  41 +       if (!br_netfilter_run_hooks())
  42 +               return okfn(skb);
  43 +
  44 +       return NF_HOOK(pf, hook, skb, in, out, okfn);
  45 +}
  46 +
  47  static int br_pass_frame_up(struct sk_buff *skb)
  48  {
  49         struct net_device *indev, *brdev = BR_INPUT_SKB_CB(skb)->brdev;
  50 @@ -40,7 +51,7 @@ static int br_pass_frame_up(struct sk_bu
  51         indev = skb->dev;
  52         skb->dev = brdev;
  53
  54 -       return NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL,
  55 +       return BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL,
  56                        netif_receive_skb);
  57  }
  58
  59 @@ -199,7 +210,7 @@ rx_handler_result_t br_handle_frame(stru
  60                 }
  61
  62                 /* Deliver packet to local host only */
  63 -               if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev,
  64 +               if (BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev,
  65                             NULL, br_handle_local_finish)) {
  66                         return RX_HANDLER_CONSUMED; /* consumed by filter */
  67                 } else {
  68 @@ -224,7 +235,7 @@ forward:
  69                 if (!compare_ether_addr(p->br->dev->dev_addr, dest))
  70                         skb->pkt_type = PACKET_HOST;
  71
  72 -               NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
  73 +               BR_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
  74                         br_handle_frame_finish);
  75                 break;
  76         default: