summaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.31/110-netfilter_match_speedup.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-04-28 19:59:28 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-04-28 19:59:28 +0000
commit24726a0cdcb7477b5a6d17c5e6e7fa4680ded1c5 (patch)
treed6fe7ad0b6d1ad1f628d5402e3b75cff7ee9b74e /target/linux/generic-2.6/patches-2.6.31/110-netfilter_match_speedup.patch
parente86e41d6631143bba47565354ac733ae21ca33ad (diff)
downloadmaster-31e0f0ae-24726a0cdcb7477b5a6d17c5e6e7fa4680ded1c5.tar.gz
master-31e0f0ae-24726a0cdcb7477b5a6d17c5e6e7fa4680ded1c5.tar.bz2
master-31e0f0ae-24726a0cdcb7477b5a6d17c5e6e7fa4680ded1c5.zip
refresh 2.6.31 patches
SVN-Revision: 21240
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.31/110-netfilter_match_speedup.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.31/110-netfilter_match_speedup.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.31/110-netfilter_match_speedup.patch b/target/linux/generic-2.6/patches-2.6.31/110-netfilter_match_speedup.patch
index d6c113aa3e..bcc1878c9e 100644
--- a/target/linux/generic-2.6/patches-2.6.31/110-netfilter_match_speedup.patch
+++ b/target/linux/generic-2.6/patches-2.6.31/110-netfilter_match_speedup.patch
@@ -127,10 +127,11 @@
e = (struct ipt_entry *)(loc_cpu_entry + off);
if (copy_to_user(userptr + off
-@@ -988,6 +1028,14 @@ copy_entries_to_user(unsigned int total_
+@@ -987,6 +1027,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) {