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
commit15a48a38b8ea48596667ef340a7d263fe74fbaa0 (patch)
treeb7feb2c8ab6c41b9e49a14d5202072ae11f53e49 /target/linux/generic/patches-3.14/644-bridge_optimize_netfilter_hooks.patch
parent5685e23f48e1f2c4ce44b3328a431b79bab85e41 (diff)
downloadmaster-187ad058-15a48a38b8ea48596667ef340a7d263fe74fbaa0.tar.gz
master-187ad058-15a48a38b8ea48596667ef340a7d263fe74fbaa0.tar.bz2
master-187ad058-15a48a38b8ea48596667ef340a7d263fe74fbaa0.zip
kernel: update 3.14 to 3.14.25
Signed-off-by: Luka Perkov <luka@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43427 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 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