aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.33/110-netfilter_match_speedup.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-08-22 17:08:07 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-08-22 17:08:07 +0000
commit4b4be29af21c7467c3c33bde8b8bf350cb33659e (patch)
tree512dd7f74558597fde134ad72b114ac77db5acc8 /target/linux/generic/patches-2.6.33/110-netfilter_match_speedup.patch
parent53fe275b46d02e08a2bd663ed59e61204a3d6b05 (diff)
downloadupstream-4b4be29af21c7467c3c33bde8b8bf350cb33659e.tar.gz
upstream-4b4be29af21c7467c3c33bde8b8bf350cb33659e.tar.bz2
upstream-4b4be29af21c7467c3c33bde8b8bf350cb33659e.zip
[kernel] update to 2.6.33.7
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22767 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.33/110-netfilter_match_speedup.patch')
-rw-r--r--target/linux/generic/patches-2.6.33/110-netfilter_match_speedup.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-2.6.33/110-netfilter_match_speedup.patch b/target/linux/generic/patches-2.6.33/110-netfilter_match_speedup.patch
index e99c6db4d1..ca64e6c3ef 100644
--- a/target/linux/generic/patches-2.6.33/110-netfilter_match_speedup.patch
+++ b/target/linux/generic/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) {