generic: disintegrate UAPI from include/linux/switch.h

[openwrt/svn-archive/archive.git] / target / linux / generic / patches-3.3 / 644-bridge_optimize_netfilter_hooks.patch

diff --git a/target/linux/generic/patches-3.3/644-bridge_optimize_netfilter_hooks.patch b/target/linux/generic/patches-3.3/644-bridge_optimize_netfilter_hooks.patch
index af793ee83033eb62726facc3f6c4c2521d0d026a..dafe4208179b6abba94e75f44d5e3a1d01913c52 100644 (file)
--- a/target/linux/generic/patches-3.3/644-bridge_optimize_netfilter_hooks.patch
+++ b/target/linux/generic/patches-3.3/644-bridge_optimize_netfilter_hooks.patch
@@ -1,3 +1,32 @@
+--- a/net/bridge/br_forward.c
++++ b/net/bridge/br_forward.c
+@@ -55,7 +55,7 @@ int br_dev_queue_push_xmit(struct sk_buf
+ 
+ int br_forward_finish(struct sk_buff *skb)
+ {
+-      return NF_HOOK(NFPROTO_BRIDGE, NF_BR_POST_ROUTING, skb, NULL, skb->dev,
++      return BR_HOOK(NFPROTO_BRIDGE, NF_BR_POST_ROUTING, skb, NULL, skb->dev,
+                      br_dev_queue_push_xmit);
+ 
+ }
+@@ -74,7 +74,7 @@ static void __br_deliver(const struct ne
+               return;
+       }
+ 
+-      NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
++      BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
+               br_forward_finish);
+ }
+ 
+@@ -91,7 +91,7 @@ static void __br_forward(const struct ne
+       skb->dev = to->dev;
+       skb_forward_csum(skb);
+ 
+-      NF_HOOK(NFPROTO_BRIDGE, NF_BR_FORWARD, skb, indev, skb->dev,
++      BR_HOOK(NFPROTO_BRIDGE, NF_BR_FORWARD, skb, indev, skb->dev,
+               br_forward_finish);
+ }
+ 
 --- a/net/bridge/br_input.c
 +++ b/net/bridge/br_input.c
 @@ -40,7 +40,7 @@ static int br_pass_frame_up(struct sk_bu
@@ -9,7 +38,7 @@
                       netif_receive_skb);
  }
  
-@@ -194,7 +194,7 @@ rx_handler_result_t br_handle_frame(stru
+@@ -199,7 +199,7 @@ rx_handler_result_t br_handle_frame(stru
                }
  
                /* Deliver packet to local host only */
@@ -18,7 +47,7 @@
                            NULL, br_handle_local_finish)) {
                        return RX_HANDLER_CONSUMED; /* consumed by filter */
                } else {
-@@ -219,7 +219,7 @@ forward:
+@@ -224,7 +224,7 @@ forward:
                if (!compare_ether_addr(p->br->dev->dev_addr, dest))
                        skb->pkt_type = PACKET_HOST;
  
@@ -27,15 +56,30 @@
                        br_handle_frame_finish);
                break;
        default:
+--- a/net/bridge/br_multicast.c
++++ b/net/bridge/br_multicast.c
+@@ -753,7 +753,7 @@ static void __br_multicast_send_query(st
+       if (port) {
+               __skb_push(skb, sizeof(struct ethhdr));
+               skb->dev = port->dev;
+-              NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
++              BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
+                       dev_queue_xmit);
+       } else
+               netif_rx(skb);
 --- a/net/bridge/br_netfilter.c
 +++ b/net/bridge/br_netfilter.c
-@@ -71,6 +71,11 @@ static int brnf_filter_pppoe_tagged __re
+@@ -71,6 +71,15 @@ static int brnf_filter_pppoe_tagged __re
  #define IS_ARP(skb) \
        (!vlan_tx_tag_present(skb) && skb->protocol == htons(ETH_P_ARP))
  
++int brnf_call_ebtables __read_mostly = 0;
++EXPORT_SYMBOL_GPL(brnf_call_ebtables);
++
 +bool br_netfilter_run_hooks(void)
 +{
-+      return brnf_call_iptables | brnf_call_ip6tables | brnf_call_arptables;
++      return brnf_call_iptables | brnf_call_ip6tables | brnf_call_arptables |
++             brnf_call_ebtables;
 +}
 +
  static inline __be16 vlan_proto(const struct sk_buff *skb)
@@ -43,7 +87,11 @@
        if (vlan_tx_tag_present(skb))
 --- a/net/bridge/br_private.h
 +++ b/net/bridge/br_private.h
-@@ -492,12 +492,25 @@ static inline bool br_multicast_is_route
+@@ -486,15 +486,29 @@ static inline bool br_multicast_is_route
+ 
+ /* br_netfilter.c */
+ #ifdef CONFIG_BRIDGE_NETFILTER
++extern int brnf_call_ebtables;
  extern int br_netfilter_init(void);
  extern void br_netfilter_fini(void);
  extern void br_netfilter_rtable_init(struct net_bridge *);
@@ -69,46 +117,6 @@
  /* br_stp.c */
  extern void br_log_state(const struct net_bridge_port *p);
  extern struct net_bridge_port *br_get_port(struct net_bridge *br,
---- a/net/bridge/br_forward.c
-+++ b/net/bridge/br_forward.c
-@@ -55,7 +55,7 @@ int br_dev_queue_push_xmit(struct sk_buf
- 
- int br_forward_finish(struct sk_buff *skb)
- {
--      return NF_HOOK(NFPROTO_BRIDGE, NF_BR_POST_ROUTING, skb, NULL, skb->dev,
-+      return BR_HOOK(NFPROTO_BRIDGE, NF_BR_POST_ROUTING, skb, NULL, skb->dev,
-                      br_dev_queue_push_xmit);
- 
- }
-@@ -74,7 +74,7 @@ static void __br_deliver(const struct ne
-               return;
-       }
- 
--      NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
-+      BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
-               br_forward_finish);
- }
- 
-@@ -91,7 +91,7 @@ static void __br_forward(const struct ne
-       skb->dev = to->dev;
-       skb_forward_csum(skb);
- 
--      NF_HOOK(NFPROTO_BRIDGE, NF_BR_FORWARD, skb, indev, skb->dev,
-+      BR_HOOK(NFPROTO_BRIDGE, NF_BR_FORWARD, skb, indev, skb->dev,
-               br_forward_finish);
- }
- 
---- a/net/bridge/br_multicast.c
-+++ b/net/bridge/br_multicast.c
-@@ -827,7 +827,7 @@ static void __br_multicast_send_query(st
-       if (port) {
-               __skb_push(skb, sizeof(struct ethhdr));
-               skb->dev = port->dev;
--              NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
-+              BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
-                       dev_queue_xmit);
-       } else
-               netif_rx(skb);
 --- a/net/bridge/br_stp_bpdu.c
 +++ b/net/bridge/br_stp_bpdu.c
 @@ -52,7 +52,7 @@ static void br_send_bpdu(struct net_brid
@@ -120,3 +128,19 @@
                dev_queue_xmit);
  }
  
+--- a/net/bridge/netfilter/ebtables.c
++++ b/net/bridge/netfilter/ebtables.c
+@@ -2403,11 +2403,13 @@ static int __init ebtables_init(void)
+       }
+ 
+       printk(KERN_INFO "Ebtables v2.0 registered\n");
++      brnf_call_ebtables = 1;
+       return 0;
+ }
+ 
+ static void __exit ebtables_fini(void)
+ {
++      brnf_call_ebtables = 0;
+       nf_unregister_sockopt(&ebt_sockopts);
+       xt_unregister_target(&ebt_standard_target);
+       printk(KERN_INFO "Ebtables v2.0 unregistered\n");