aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-08-11 09:21:05 +0000
committerLuka Perkov <luka@openwrt.org>2014-08-11 09:21:05 +0000
commita7840a03067e7c8d28dbd0e4b2100f3a05d2ed63 (patch)
treeb027eec15720540104f28674c808b22a409abbd9 /target/linux
parent01fd9627456c0c39f63408a3513237d6270efda3 (diff)
downloadupstream-a7840a03067e7c8d28dbd0e4b2100f3a05d2ed63.tar.gz
upstream-a7840a03067e7c8d28dbd0e4b2100f3a05d2ed63.tar.bz2
upstream-a7840a03067e7c8d28dbd0e4b2100f3a05d2ed63.zip
kernel: 3.14: refresh patches
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 42113
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic/patches-3.14/617-netfilter_skip_filter_sysctl.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.14/617-netfilter_skip_filter_sysctl.patch b/target/linux/generic/patches-3.14/617-netfilter_skip_filter_sysctl.patch
index 93d38f56d8..255eaae52e 100644
--- a/target/linux/generic/patches-3.14/617-netfilter_skip_filter_sysctl.patch
+++ b/target/linux/generic/patches-3.14/617-netfilter_skip_filter_sysctl.patch
@@ -63,7 +63,7 @@
net->ipv6.ip6table_filter);
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
-@@ -477,6 +477,13 @@ static struct ctl_table nf_ct_sysctl_tab
+@@ -510,6 +510,13 @@ static struct ctl_table nf_ct_sysctl_tab
.extra2 = &log_invalid_proto_max,
},
{
@@ -77,7 +77,7 @@
.procname = "nf_conntrack_expect_max",
.data = &nf_ct_expect_max,
.maxlen = sizeof(int),
-@@ -512,6 +519,7 @@ static int nf_conntrack_standalone_init_
+@@ -545,6 +552,7 @@ static int nf_conntrack_standalone_init_
table[2].data = &net->ct.htable_size;
table[3].data = &net->ct.sysctl_checksum;
table[4].data = &net->ct.sysctl_log_invalid;