From 672edbbcc089f143eee2bdeb3088858e2f5c7034 Mon Sep 17 00:00:00 2001 From: Luka Perkov Date: Tue, 29 Oct 2013 02:19:05 +0000 Subject: kernel: refresh 3.12 patches on -rc7 release Signed-off-by: Luka Perkov git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38572 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../generic/patches-3.12/644-bridge_optimize_netfilter_hooks.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'target/linux/generic/patches-3.12/644-bridge_optimize_netfilter_hooks.patch') diff --git a/target/linux/generic/patches-3.12/644-bridge_optimize_netfilter_hooks.patch b/target/linux/generic/patches-3.12/644-bridge_optimize_netfilter_hooks.patch index b657981475..85def08702 100644 --- a/target/linux/generic/patches-3.12/644-bridge_optimize_netfilter_hooks.patch +++ b/target/linux/generic/patches-3.12/644-bridge_optimize_netfilter_hooks.patch @@ -67,7 +67,7 @@ default: --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c -@@ -799,7 +799,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 -@@ -728,15 +728,29 @@ static inline u16 br_get_pvid(const stru +@@ -725,15 +725,29 @@ static inline u16 br_get_pvid(const stru /* br_netfilter.c */ #ifdef CONFIG_BRIDGE_NETFILTER -- cgit v1.2.3