diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-01-05 13:02:31 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-01-05 13:02:31 +0000 |
| commit | 71919ae34436258e3b8dce4cbb08758958443877 (patch) | |
| tree | 5f75f870ac87b48d58c56e742b680b1e87982bcc /target/linux/generic/patches-3.10/644-bridge_optimize_netfilter_hooks.patch | |
| parent | 28f5eeb8331237ebd918cfbec13d9599f93a3999 (diff) | |
| download | master-187ad058-71919ae34436258e3b8dce4cbb08758958443877.tar.gz master-187ad058-71919ae34436258e3b8dce4cbb08758958443877.tar.bz2 master-187ad058-71919ae34436258e3b8dce4cbb08758958443877.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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43841 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 |