diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2014-03-31 13:43:06 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2014-03-31 13:43:06 +0000 |
| commit | 36fefbb60e17cf2978b5ea0f954ef992e02c9ca3 (patch) | |
| tree | 2998c2a4ed3532a1d01bbbbf97d0b185d74016ac /target/linux/generic/patches-3.14/644-bridge_optimize_netfilter_hooks.patch | |
| parent | a22190340a3b25ce385b89bdcee4c8a7c1e91223 (diff) | |
| download | mtk-20170518-36fefbb60e17cf2978b5ea0f954ef992e02c9ca3.zip mtk-20170518-36fefbb60e17cf2978b5ea0f954ef992e02c9ca3.tar.gz mtk-20170518-36fefbb60e17cf2978b5ea0f954ef992e02c9ca3.tar.bz2 | |
3.14 final is out
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
SVN-Revision: 40352
Diffstat (limited to 'target/linux/generic/patches-3.14/644-bridge_optimize_netfilter_hooks.patch')
| -rw-r--r-- | target/linux/generic/patches-3.14/644-bridge_optimize_netfilter_hooks.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/generic/patches-3.14/644-bridge_optimize_netfilter_hooks.patch b/target/linux/generic/patches-3.14/644-bridge_optimize_netfilter_hooks.patch index 84b2420..3af45ec 100644 --- a/target/linux/generic/patches-3.14/644-bridge_optimize_netfilter_hooks.patch +++ b/target/linux/generic/patches-3.14/644-bridge_optimize_netfilter_hooks.patch @@ -29,16 +29,16 @@ --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c -@@ -52,7 +52,7 @@ static int br_pass_frame_up(struct sk_bu - indev = skb->dev; - skb->dev = brdev; +@@ -53,7 +53,7 @@ static int br_pass_frame_up(struct sk_bu + if (!skb) + return NET_RX_DROP; - return NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL, + return BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL, netif_receive_skb); } -@@ -213,7 +213,7 @@ rx_handler_result_t br_handle_frame(stru +@@ -214,7 +214,7 @@ rx_handler_result_t br_handle_frame(stru } /* Deliver packet to local host only */ @@ -47,7 +47,7 @@ NULL, br_handle_local_finish)) { return RX_HANDLER_CONSUMED; /* consumed by filter */ } else { -@@ -228,7 +228,7 @@ forward: +@@ -229,7 +229,7 @@ forward: if (ether_addr_equal(p->br->dev->dev_addr, dest)) skb->pkt_type = PACKET_HOST; @@ -56,7 +56,7 @@ br_handle_local_finish)) break; -@@ -250,7 +250,7 @@ forward: +@@ -251,7 +251,7 @@ forward: if (ether_addr_equal(p->br->dev->dev_addr, dest)) skb->pkt_type = PACKET_HOST; |