aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.14/644-bridge_optimize_netfilter_hooks.patch
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-11-29 10:30:58 +0000
committerLuka Perkov <luka@openwrt.org>2014-11-29 10:30:58 +0000
commit070d3b27c223f23a4793667264441f8c2f008755 (patch)
tree70118ffb38f5c0d059605e8a15e6edee87d21d22 /target/linux/generic/patches-3.14/644-bridge_optimize_netfilter_hooks.patch
parentd11aefc8eb1faf362ac35712d8a1741768534580 (diff)
downloadupstream-070d3b27c223f23a4793667264441f8c2f008755.tar.gz
upstream-070d3b27c223f23a4793667264441f8c2f008755.tar.bz2
upstream-070d3b27c223f23a4793667264441f8c2f008755.zip
kernel: update 3.14 to 3.14.25
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 43427
Diffstat (limited to 'target/linux/generic/patches-3.14/644-bridge_optimize_netfilter_hooks.patch')
-rw-r--r--target/linux/generic/patches-3.14/644-bridge_optimize_netfilter_hooks.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/patches-3.14/644-bridge_optimize_netfilter_hooks.patch b/target/linux/generic/patches-3.14/644-bridge_optimize_netfilter_hooks.patch
index 9b223fba97..6948fcf6cb 100644
--- a/target/linux/generic/patches-3.14/644-bridge_optimize_netfilter_hooks.patch
+++ b/target/linux/generic/patches-3.14/644-bridge_optimize_netfilter_hooks.patch
@@ -96,7 +96,7 @@
if (vlan_tx_tag_present(skb))
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
-@@ -724,15 +724,29 @@ static inline u16 br_get_pvid(const stru
+@@ -727,15 +727,29 @@ static inline u16 br_get_pvid(const stru
/* br_netfilter.c */
#ifdef CONFIG_BRIDGE_NETFILTER