summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.30/110-netfilter_match_speedup.patch
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-04-13 19:37:15 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-04-13 19:37:15 +0000
commit1e83690598205f077d6ada4e0b52c7f61562c20c (patch)
tree0de8f423a69084545119a9762dabc190bce120f2 /target/linux/generic/patches-2.6.30/110-netfilter_match_speedup.patch
parent4ad28d6429b7393334334d5cd46eeb88290e12f2 (diff)
kernel: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31279 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 926966ced..e75d7aaee 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) {