kernel/3.10: add new Kconfig option for firmware partition split

[oweals/openwrt.git] / target / linux / generic / patches-3.10 / 644-bridge_optimize_netfilter_hooks.patch

diff --git a/target/linux/generic/patches-3.10/644-bridge_optimize_netfilter_hooks.patch b/target/linux/generic/patches-3.10/644-bridge_optimize_netfilter_hooks.patch
index bc56b71d37f06d341258471a1f6a9161e652a6be..5b5dba50416a0b84a89feb60ea6d1f488b10c799 100644 (file)
--- a/target/linux/generic/patches-3.10/644-bridge_optimize_netfilter_hooks.patch
+++ b/target/linux/generic/patches-3.10/644-bridge_optimize_netfilter_hooks.patch
@@ -38,7 +38,7 @@
                       netif_receive_skb);
  }
  
-@@ -205,7 +205,7 @@ rx_handler_result_t br_handle_frame(stru
+@@ -209,7 +209,7 @@ rx_handler_result_t br_handle_frame(stru
                }
  
                /* Deliver packet to local host only */
@@ -47,7 +47,16 @@
                            NULL, br_handle_local_finish)) {
                        return RX_HANDLER_CONSUMED; /* consumed by filter */
                } else {
-@@ -230,7 +230,7 @@ forward:
+@@ -224,7 +224,7 @@ forward:
+               if (ether_addr_equal(p->br->dev->dev_addr, dest))
+                       skb->pkt_type = PACKET_HOST;
+ 
+-              if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
++              if (BR_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
+                       br_handle_local_finish))
+                       break;
+ 
+@@ -246,7 +246,7 @@ forward:
                if (ether_addr_equal(p->br->dev->dev_addr, dest))
                        skb->pkt_type = PACKET_HOST;