diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2014-11-24 10:17:33 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2014-11-24 10:17:33 +0000 |
| commit | 9608230812a5116d6c7cfed4ec9b8350db3d6f2d (patch) | |
| tree | dbbf2f74fcc4a6b7757db546de816b48bf7b6038 /target/linux/generic/patches-3.18/644-bridge_optimize_netfilter_hooks.patch | |
| parent | d6a879e35aa38450636bd68100e041ee2f66cbb7 (diff) | |
| download | master-187ad058-9608230812a5116d6c7cfed4ec9b8350db3d6f2d.tar.gz master-187ad058-9608230812a5116d6c7cfed4ec9b8350db3d6f2d.tar.bz2 master-187ad058-9608230812a5116d6c7cfed4ec9b8350db3d6f2d.zip | |
[generic]: update .18 support for -rc6
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43357 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.18/644-bridge_optimize_netfilter_hooks.patch')
| -rw-r--r-- | target/linux/generic/patches-3.18/644-bridge_optimize_netfilter_hooks.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.18/644-bridge_optimize_netfilter_hooks.patch b/target/linux/generic/patches-3.18/644-bridge_optimize_netfilter_hooks.patch index bbfcaa402d..c876c2bce0 100644 --- a/target/linux/generic/patches-3.18/644-bridge_optimize_netfilter_hooks.patch +++ b/target/linux/generic/patches-3.18/644-bridge_optimize_netfilter_hooks.patch @@ -67,13 +67,13 @@ default: --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c -@@ -815,7 +815,7 @@ static void __br_multicast_send_query(st +@@ -814,7 +814,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); + br_dev_queue_push_xmit); } else { br_multicast_select_own_querier(br, ip, skb); --- a/net/bridge/br_netfilter.c |