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 | a89ef54d18ec58ec244816040be521c6953a1b28 (patch) | |
tree | b7386fb78eb83acd6f72a9d110a36f2f676975eb /target/linux/generic/patches-3.14/644-bridge_optimize_netfilter_hooks.patch | |
parent | f289cd075053af40fd15070256cd007a817bd6d2 (diff) | |
download | master-187ad058-a89ef54d18ec58ec244816040be521c6953a1b28.tar.gz master-187ad058-a89ef54d18ec58ec244816040be521c6953a1b28.tar.bz2 master-187ad058-a89ef54d18ec58ec244816040be521c6953a1b28.zip |
3.14 final is out
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40352 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 84b2420d20..3af45ecfc9 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; |