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 | 2b9379052e3145596eb2abd2b81da62fc9a9a455 (patch) | |
| tree | b76056c2e0a4495da67e50e708b87e8e878c4b4d /target/linux/generic/patches-3.10/644-bridge_optimize_netfilter_hooks.patch | |
| parent | 36fa8e4ce277ebbd5f29ef4cfcca26a42898022e (diff) | |
| download | upstream-2b9379052e3145596eb2abd2b81da62fc9a9a455.tar.gz upstream-2b9379052e3145596eb2abd2b81da62fc9a9a455.tar.bz2 upstream-2b9379052e3145596eb2abd2b81da62fc9a9a455.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>
SVN-Revision: 43841
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 |