diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-01-19 01:13:25 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-01-19 01:13:25 +0000 |
| commit | 0030bded51106a9e6ad4e2c41d90d00d04ce26b2 (patch) | |
| tree | 883ba54cd3da83665f21315834caaec643c1f887 /target/linux/generic/patches-3.10/644-bridge_optimize_netfilter_hooks.patch | |
| parent | ae69e6dbf8dbd95128838f2b55b4057bc29ada02 (diff) | |
| download | upstream-0030bded51106a9e6ad4e2c41d90d00d04ce26b2.tar.gz upstream-0030bded51106a9e6ad4e2c41d90d00d04ce26b2.tar.bz2 upstream-0030bded51106a9e6ad4e2c41d90d00d04ce26b2.zip | |
kernel: bridge: multicast: backport a few more fixes for 3.10
The following patches unfortunately didn't hit the kernel stable
branches yet, therefore cherrypicking them for OpenWRT here:
* bridge: fix netfilter/NF_BR_LOCAL_OUT for own, locally generated queries
* bridge: multicast: enable snooping on general queries only
* bridge: multicast: add sanity check for general query destination
Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
Backport of r43841
git-svn-id: svn://svn.openwrt.org/openwrt/branches/barrier_breaker@44049 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.10/644-bridge_optimize_netfilter_hooks.patch')
| -rw-r--r-- | target/linux/generic/patches-3.10/644-bridge_optimize_netfilter_hooks.patch | 6 |
1 files changed, 3 insertions, 3 deletions
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 a9c5d689fe..7ad2e2c47f 100644 --- 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 @@ -67,13 +67,13 @@ default: --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c -@@ -802,7 +802,7 @@ static void __br_multicast_send_query(st +@@ -801,7 +801,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 netif_rx(skb); --- a/net/bridge/br_netfilter.c |