linux: refresh patches against 3.3

[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..d2fdd614c34383f12b278e9a576f4b42a0744ed1 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
@@ -9,7 +9,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 +18,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;
  
@@ -43,7 +43,7 @@
        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
+@@ -493,12 +493,25 @@ static inline bool br_multicast_is_route
  extern int br_netfilter_init(void);
  extern void br_netfilter_fini(void);
  extern void br_netfilter_rtable_init(struct net_bridge *);