aboutsummaryrefslogtreecommitdiffstats
path: root/target
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
commit5334c569415cf0f0acb7e5d58fe0e74f3e899303 (patch)
tree498fcb73025e878de37b1eb3e95efadf2477a69c /target
parent05ac8fe35618dae64ca4becfc6fc8dde3aac91f4 (diff)
downloadupstream-5334c569415cf0f0acb7e5d58fe0e74f3e899303.tar.gz
upstream-5334c569415cf0f0acb7e5d58fe0e74f3e899303.tar.bz2
upstream-5334c569415cf0f0acb7e5d58fe0e74f3e899303.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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38547 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-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;
+}