aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.32/110-netfilter_match_speedup.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-05-09 18:13:49 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-05-09 18:13:49 +0000
commit6e2b8d4b682fe48d5143ec54fbccff2633855e81 (patch)
tree31a36d9075ac84f3ac4bc896dc0cb8e54ce7ae05 /target/linux/generic-2.6/patches-2.6.32/110-netfilter_match_speedup.patch
parentb145752f2dfc13b9ce373e8c0c9cc87ca0e2b4b2 (diff)
downloadmaster-187ad058-6e2b8d4b682fe48d5143ec54fbccff2633855e81.tar.gz
master-187ad058-6e2b8d4b682fe48d5143ec54fbccff2633855e81.tar.bz2
master-187ad058-6e2b8d4b682fe48d5143ec54fbccff2633855e81.zip
[kernel] refresh 2.6.32 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21411 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.32/110-netfilter_match_speedup.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.32/110-netfilter_match_speedup.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.32/110-netfilter_match_speedup.patch b/target/linux/generic-2.6/patches-2.6.32/110-netfilter_match_speedup.patch
index a9eb1089f5..04ba710274 100644
--- a/target/linux/generic-2.6/patches-2.6.32/110-netfilter_match_speedup.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/110-netfilter_match_speedup.patch
@@ -127,10 +127,11 @@
e = (struct ipt_entry *)(loc_cpu_entry + off);
if (copy_to_user(userptr + off
-@@ -1002,6 +1042,14 @@ copy_entries_to_user(unsigned int total_
+@@ -1001,6 +1041,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) {