Linux kernel commit c655bc6896b94ee0223393f26155c6daf1e2d148 introduced two new arguments to the nf_ct_iterate_cleanup() function. This patch passes NULLs for those arguments, in lieu of anything more obvious to do. This code patched here first appears in openwrt at r35330: "netfilter: add support for flushing conntrack via /proc"
Signed-off-by: Russell Senior <russ...@personaltelco.net> --- .../patches-3.14/617-netfilter_skip_filter_sysctl.patch | 13 +++++++++++-- 1 file changed, 11 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 93d38f5..19e2fa7 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,16 @@ 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 +@@ -316,7 +316,7 @@ static ssize_t ct_file_write(struct file + return -EINVAL; + } + +- nf_ct_iterate_cleanup(net, kill_matching, &kr); ++ nf_ct_iterate_cleanup(net, kill_matching, &kr, 0, 0); + + return count; + } +@@ -507,6 +507,13 @@ static struct ctl_table nf_ct_sysctl_tab .extra2 = &log_invalid_proto_max, }, { @@ -77,7 +86,7 @@ .procname = "nf_conntrack_expect_max", .data = &nf_ct_expect_max, .maxlen = sizeof(int), -@@ -512,6 +519,7 @@ static int nf_conntrack_standalone_init_ +@@ -542,6 +549,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; -- 2.0.0 -- Russell Senior, President russ...@personaltelco.net _______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel