diff options
| author | Luka Perkov <luka@openwrt.org> | 2013-10-29 02:19:05 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2013-10-29 02:19:05 +0000 |
| commit | 672edbbcc089f143eee2bdeb3088858e2f5c7034 (patch) | |
| tree | 4ed9ec0fb95d358bb0c60755b14b140a1159ab18 /target/linux/generic/patches-3.12/644-bridge_optimize_netfilter_hooks.patch | |
| parent | 58abdeaa982a1531e10556028cdbe78123c595c6 (diff) | |
| download | upstream-672edbbcc089f143eee2bdeb3088858e2f5c7034.tar.gz upstream-672edbbcc089f143eee2bdeb3088858e2f5c7034.tar.bz2 upstream-672edbbcc089f143eee2bdeb3088858e2f5c7034.zip | |
kernel: refresh 3.12 patches on -rc7 release
Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38572 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.12/644-bridge_optimize_netfilter_hooks.patch')
| -rw-r--r-- | target/linux/generic/patches-3.12/644-bridge_optimize_netfilter_hooks.patch | 4 |
1 files changed, 2 insertions, 2 deletions
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 |