aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
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
commit47f73ebe7b5ab4cc3a4a45a008967030f14c48cf (patch)
tree8e1081d501c6472d1b51793e7a47eb5beeb802a2 /target/linux/generic
parent44ffcf4d4e9d289d29b7038a9f6550534f47cb6e (diff)
downloadupstream-47f73ebe7b5ab4cc3a4a45a008967030f14c48cf.tar.gz
upstream-47f73ebe7b5ab4cc3a4a45a008967030f14c48cf.tar.bz2
upstream-47f73ebe7b5ab4cc3a4a45a008967030f14c48cf.zip
netfilter: fix calls to nf_ct_iterate_cleanup() with Linux >= 3.13
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42093 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic')
-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;
+}