From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 10 Aug 2014 09:21:14 +0000 (+0000)
Subject: netfilter: fix calls to nf_ct_iterate_cleanup() with Linux >= 3.13
X-Git-Tag: reboot~6263
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f1b40f93040af6940687b70d233909f333f7169a;p=openwrt%2Fstaging%2Fblogic.git

netfilter: fix calls to nf_ct_iterate_cleanup() with Linux >= 3.13

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 42093
---

diff --git a/target/linux/generic/patches-3.13/604-netfilter_conntrack_flush.patch b/target/linux/generic/patches-3.13/604-netfilter_conntrack_flush.patch
index 1b5e2abbec9f..a115e1c3f025 100644
--- a/target/linux/generic/patches-3.13/604-netfilter_conntrack_flush.patch
+++ b/target/linux/generic/patches-3.13/604-netfilter_conntrack_flush.patch
@@ -59,7 +59,7 @@
 +			return -EINVAL;
 +	}
 +
-+	nf_ct_iterate_cleanup(net, kill_matching, &kr);
++	nf_ct_iterate_cleanup(net, kill_matching, &kr, 0, 0);
 +
 +	return count;
 +}
diff --git a/target/linux/generic/patches-3.14/604-netfilter_conntrack_flush.patch b/target/linux/generic/patches-3.14/604-netfilter_conntrack_flush.patch
index 1b5e2abbec9f..a115e1c3f025 100644
--- a/target/linux/generic/patches-3.14/604-netfilter_conntrack_flush.patch
+++ b/target/linux/generic/patches-3.14/604-netfilter_conntrack_flush.patch
@@ -59,7 +59,7 @@
 +			return -EINVAL;
 +	}
 +
-+	nf_ct_iterate_cleanup(net, kill_matching, &kr);
++	nf_ct_iterate_cleanup(net, kill_matching, &kr, 0, 0);
 +
 +	return count;
 +}