aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2014-08-10 09:21:14 +0000
committerJo-Philipp Wich <jow@openwrt.org>2014-08-10 09:21:14 +0000
commitf1b40f93040af6940687b70d233909f333f7169a (patch)
treee3031d423c9b93d1fa9636ba3c09bef80997e96a /target/linux
parent56be9f4a9a69072cdaa38473155d609aea1ea6e4 (diff)
downloadupstream-f1b40f93040af6940687b70d233909f333f7169a.tar.gz
upstream-f1b40f93040af6940687b70d233909f333f7169a.tar.bz2
upstream-f1b40f93040af6940687b70d233909f333f7169a.zip
netfilter: fix calls to nf_ct_iterate_cleanup() with Linux >= 3.13
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> SVN-Revision: 42093
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic/patches-3.13/604-netfilter_conntrack_flush.patch2
-rw-r--r--target/linux/generic/patches-3.14/604-netfilter_conntrack_flush.patch2
2 files changed, 2 insertions, 2 deletions
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 1b5e2abbec..a115e1c3f0 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 1b5e2abbec..a115e1c3f0 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;
+}