summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.32/110-netfilter_match_speedup.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-07-17 17:20:16 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-07-17 17:20:16 +0000
commit3ad5c63eec0138985a1db60c882c88224cad9537 (patch)
treec16b618ea23d8e54f845ef10ff55dd74e7f4e01c /target/linux/generic/patches-2.6.32/110-netfilter_match_speedup.patch
parent2e0ff6cb7c1a6396f59c2447d48c31191c6ddbb4 (diff)
downloadmaster-31e0f0ae-3ad5c63eec0138985a1db60c882c88224cad9537.tar.gz
master-31e0f0ae-3ad5c63eec0138985a1db60c882c88224cad9537.tar.bz2
master-31e0f0ae-3ad5c63eec0138985a1db60c882c88224cad9537.zip
refresh 2.6.32 patches
SVN-Revision: 22256
Diffstat (limited to 'target/linux/generic/patches-2.6.32/110-netfilter_match_speedup.patch')
-rw-r--r--target/linux/generic/patches-2.6.32/110-netfilter_match_speedup.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-2.6.32/110-netfilter_match_speedup.patch b/target/linux/generic/patches-2.6.32/110-netfilter_match_speedup.patch
index a9eb1089f5..04ba710274 100644
--- a/target/linux/generic/patches-2.6.32/110-netfilter_match_speedup.patch
+++ b/target/linux/generic/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) {