aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.33/110-netfilter_match_speedup.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-04-11 18:15:15 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-04-11 18:15:15 +0000
commit2a018eb3806d5ea13e16dbf629b2c7e4fa541b51 (patch)
treecb776e8b62bdb71cd3834275ae79db8bc83c107c /target/linux/generic-2.6/patches-2.6.33/110-netfilter_match_speedup.patch
parentde18353622a4d245f8b407a6f214cfbe53ec9706 (diff)
downloadupstream-2a018eb3806d5ea13e16dbf629b2c7e4fa541b51.tar.gz
upstream-2a018eb3806d5ea13e16dbf629b2c7e4fa541b51.tar.bz2
upstream-2a018eb3806d5ea13e16dbf629b2c7e4fa541b51.zip
refresh 2.6.33 patches for 2.6.33.2
SVN-Revision: 20803
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.33/110-netfilter_match_speedup.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.33/110-netfilter_match_speedup.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.33/110-netfilter_match_speedup.patch b/target/linux/generic-2.6/patches-2.6.33/110-netfilter_match_speedup.patch
index e99c6db4d1..ca64e6c3ef 100644
--- a/target/linux/generic-2.6/patches-2.6.33/110-netfilter_match_speedup.patch
+++ b/target/linux/generic-2.6/patches-2.6.33/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) {