summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.30/110-netfilter_match_speedup.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2012-04-13 19:37:15 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2012-04-13 19:37:15 +0000
commit62f0c3793b6379d47b23543a625df8ef6d550ca5 (patch)
tree5871a8370d0291b47408db3399a8e40f45256a34 /target/linux/generic/patches-2.6.30/110-netfilter_match_speedup.patch
parent6af575967c780fa41029bdb64fdd68646ab516d1 (diff)
downloadmaster-31e0f0ae-62f0c3793b6379d47b23543a625df8ef6d550ca5.tar.gz
master-31e0f0ae-62f0c3793b6379d47b23543a625df8ef6d550ca5.tar.bz2
master-31e0f0ae-62f0c3793b6379d47b23543a625df8ef6d550ca5.zip
kernel: refresh patches
SVN-Revision: 31279
Diffstat (limited to 'target/linux/generic/patches-2.6.30/110-netfilter_match_speedup.patch')
-rw-r--r--target/linux/generic/patches-2.6.30/110-netfilter_match_speedup.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-2.6.30/110-netfilter_match_speedup.patch b/target/linux/generic/patches-2.6.30/110-netfilter_match_speedup.patch
index 926966ced0..e75d7aaee4 100644
--- a/target/linux/generic/patches-2.6.30/110-netfilter_match_speedup.patch
+++ b/target/linux/generic/patches-2.6.30/110-netfilter_match_speedup.patch
@@ -127,10 +127,11 @@
e = (struct ipt_entry *)(loc_cpu_entry + off);
if (copy_to_user(userptr + off
-@@ -986,6 +1026,14 @@ copy_entries_to_user(unsigned int total_
+@@ -985,6 +1025,14 @@ copy_entries_to_user(unsigned int total_
+ ret = -EFAULT;
goto free_counters;
}
-
++
+ flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
+ if (copy_to_user(userptr + off
+ + offsetof(struct ipt_entry, ip.flags),
@@ -138,7 +139,6 @@
+ ret = -EFAULT;
+ goto free_counters;
+ }
-+
+
for (i = sizeof(struct ipt_entry);
i < e->target_offset;
- i += m->u.match_size) {