aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2013-10-27 20:47:04 +0000
committerLuka Perkov <luka@openwrt.org>2013-10-27 20:47:04 +0000
commitbe95e2415564e8f7cbd6e750dd86798a332e471e (patch)
tree33bbd6be5618928233a9dbfa7724765e1caf4612
parentfde5493acdf5564b42affdfd5131bb947094646a (diff)
downloadupstream-be95e2415564e8f7cbd6e750dd86798a332e471e.tar.gz
upstream-be95e2415564e8f7cbd6e750dd86798a332e471e.tar.bz2
upstream-be95e2415564e8f7cbd6e750dd86798a332e471e.zip
kernel: fix compile error in 3.12
Upstream commit c655bc6896b94ee0223393f26155c6daf1e2d148 changed number of arguments in nf_ct_iterate_cleanup() function. Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 38547
-rw-r--r--target/linux/generic/patches-3.12/604-netfilter_conntrack_flush.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/patches-3.12/604-netfilter_conntrack_flush.patch b/target/linux/generic/patches-3.12/604-netfilter_conntrack_flush.patch
index ecd46b6a2b..984aed0e41 100644
--- a/target/linux/generic/patches-3.12/604-netfilter_conntrack_flush.patch
+++ b/target/linux/generic/patches-3.12/604-netfilter_conntrack_flush.patch
@@ -22,7 +22,7 @@
+ return -EFAULT;
+
+ if (c == 'f')
-+ nf_ct_iterate_cleanup(net, kill_all, NULL);
++ nf_ct_iterate_cleanup(net, kill_all, NULL, 0, 0);
+ }
+ return count;
+}