diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-07-24 09:12:59 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-07-24 09:12:59 +0000 |
commit | 36a95b7f874b6e2f7dc3080341d0ba704302b103 (patch) | |
tree | 7ee0b3d81bc8df359faff61c3a49ddcaae8b58de /target/linux/generic/patches-3.10/644-bridge_optimize_netfilter_hooks.patch | |
parent | 1f81f496a7fb4b86cc0eb04d534c27f1484efa80 (diff) | |
download | master-187ad058-36a95b7f874b6e2f7dc3080341d0ba704302b103.tar.gz master-187ad058-36a95b7f874b6e2f7dc3080341d0ba704302b103.tar.bz2 master-187ad058-36a95b7f874b6e2f7dc3080341d0ba704302b103.zip |
kernel: backport upstream bridge multicast snooping fixes
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41817 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 | 10 |
1 files changed, 5 insertions, 5 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 c079b794ae..a9c5d689fe 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 @@ -38,7 +38,7 @@ netif_receive_skb); } -@@ -209,7 +209,7 @@ rx_handler_result_t br_handle_frame(stru +@@ -210,7 +210,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 { -@@ -224,7 +224,7 @@ forward: +@@ -225,7 +225,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; -@@ -246,7 +246,7 @@ forward: +@@ -247,7 +247,7 @@ forward: if (ether_addr_equal(p->br->dev->dev_addr, dest)) skb->pkt_type = PACKET_HOST; @@ -67,7 +67,7 @@ default: --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c -@@ -783,7 +783,7 @@ static void __br_multicast_send_query(st +@@ -802,7 +802,7 @@ static void __br_multicast_send_query(st if (port) { __skb_push(skb, sizeof(struct ethhdr)); skb->dev = port->dev; @@ -96,7 +96,7 @@ if (vlan_tx_tag_present(skb)) --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h -@@ -696,15 +696,29 @@ static inline u16 br_get_pvid(const stru +@@ -734,15 +734,29 @@ static inline u16 br_get_pvid(const stru /* br_netfilter.c */ #ifdef CONFIG_BRIDGE_NETFILTER |