aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.10/644-bridge_optimize_netfilter_hooks.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-10-23 12:51:05 +0000
committerGabor Juhos <juhosg@openwrt.org>2013-10-23 12:51:05 +0000
commit56e1cd4a8e3d806ff92e710c0409165847b2e7af (patch)
treea82433e4101b7b069458cf66d826c4ebd9bbe7c5 /target/linux/generic/patches-3.10/644-bridge_optimize_netfilter_hooks.patch
parent4805656f76b5ac07882c66bb81bc294d4b441571 (diff)
downloadupstream-56e1cd4a8e3d806ff92e710c0409165847b2e7af.tar.gz
upstream-56e1cd4a8e3d806ff92e710c0409165847b2e7af.tar.bz2
upstream-56e1cd4a8e3d806ff92e710c0409165847b2e7af.zip
kernel: update 3.10 to 3.10.17
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38506 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.10/644-bridge_optimize_netfilter_hooks.patch')
-rw-r--r--target/linux/generic/patches-3.10/644-bridge_optimize_netfilter_hooks.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/patches-3.10/644-bridge_optimize_netfilter_hooks.patch b/target/linux/generic/patches-3.10/644-bridge_optimize_netfilter_hooks.patch
index 5b5dba5041..ac41cf5492 100644
--- a/target/linux/generic/patches-3.10/644-bridge_optimize_netfilter_hooks.patch
+++ b/target/linux/generic/patches-3.10/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
-@@ -699,15 +699,29 @@ static inline u16 br_get_pvid(const stru
+@@ -696,15 +696,29 @@ static inline u16 br_get_pvid(const stru
/* br_netfilter.c */
#ifdef CONFIG_BRIDGE_NETFILTER