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-06-27 21:10:02 +0000
committerLuka Perkov <luka@openwrt.org>2014-06-27 21:10:02 +0000
commitb0eae8648b2d266210940cfe9be4c29f194406b7 (patch)
treef4b99027235c6a92349cb43bcd50fa8c3b27c6d1 /target/linux/generic/patches-3.14/644-bridge_optimize_netfilter_hooks.patch
parent1f9f2714fde19244b196e7797371c902ea8eeb85 (diff)
downloadmaster-187ad058-b0eae8648b2d266210940cfe9be4c29f194406b7.tar.gz
master-187ad058-b0eae8648b2d266210940cfe9be4c29f194406b7.tar.bz2
master-187ad058-b0eae8648b2d266210940cfe9be4c29f194406b7.zip
kernel: update 3.14 to 3.14.9
Signed-off-by: Luka Perkov <luka@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41362 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 d803af72f5..9b223fba97 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
-@@ -717,15 +717,29 @@ static inline u16 br_get_pvid(const stru
+@@ -724,15 +724,29 @@ static inline u16 br_get_pvid(const stru
/* br_netfilter.c */
#ifdef CONFIG_BRIDGE_NETFILTER