aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.34/110-netfilter_match_speedup.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2010-08-22 13:26:06 +0000
committerHauke Mehrtens <hauke@openwrt.org>2010-08-22 13:26:06 +0000
commit3de7c99eb33717fe6fb84b07b4fed6ec1d341b06 (patch)
tree108605e2f6ff4e21846d0f69ade88ebb76a890a3 /target/linux/generic/patches-2.6.34/110-netfilter_match_speedup.patch
parente78e58e4de3a93d64dc04c4cb062a99009c11a22 (diff)
downloadmaster-187ad058-3de7c99eb33717fe6fb84b07b4fed6ec1d341b06.tar.gz
master-187ad058-3de7c99eb33717fe6fb84b07b4fed6ec1d341b06.tar.bz2
master-187ad058-3de7c99eb33717fe6fb84b07b4fed6ec1d341b06.zip
kernel: update kernel version to 2.6.34.5
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22759 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.34/110-netfilter_match_speedup.patch')
-rw-r--r--target/linux/generic/patches-2.6.34/110-netfilter_match_speedup.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-2.6.34/110-netfilter_match_speedup.patch b/target/linux/generic/patches-2.6.34/110-netfilter_match_speedup.patch
index 41c487b689..8178a225ee 100644
--- a/target/linux/generic/patches-2.6.34/110-netfilter_match_speedup.patch
+++ b/target/linux/generic/patches-2.6.34/110-netfilter_match_speedup.patch
@@ -127,11 +127,10 @@
e = (struct ipt_entry *)(loc_cpu_entry + off);
if (copy_to_user(userptr + off
-@@ -1000,6 +1040,14 @@ copy_entries_to_user(unsigned int total_
- ret = -EFAULT;
+@@ -1001,6 +1041,14 @@ copy_entries_to_user(unsigned int total_
goto free_counters;
}
-+
+
+ flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
+ if (copy_to_user(userptr + off
+ + offsetof(struct ipt_entry, ip.flags),
@@ -139,6 +138,7 @@
+ ret = -EFAULT;
+ goto free_counters;
+ }
-
++
for (i = sizeof(struct ipt_entry);
i < e->target_offset;
+ i += m->u.match_size) {