summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.36/110-netfilter_match_speedup.patch
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-03-02 13:18:56 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-03-02 13:18:56 +0000
commita4906e04da77c551bf6d8e31ab6f858cf1541b90 (patch)
treea6e81eb17e08084625d7746ff1ebe9a5390dadde /target/linux/generic/patches-2.6.36/110-netfilter_match_speedup.patch
parent5929a7798b5f7634463831a3994eaf081b19e89b (diff)
[kernel/2.6.36] refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30779 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.36/110-netfilter_match_speedup.patch')
-rw-r--r--target/linux/generic/patches-2.6.36/110-netfilter_match_speedup.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-2.6.36/110-netfilter_match_speedup.patch b/target/linux/generic/patches-2.6.36/110-netfilter_match_speedup.patch
index a99eb084c..b146502f0 100644
--- a/target/linux/generic/patches-2.6.36/110-netfilter_match_speedup.patch
+++ b/target/linux/generic/patches-2.6.36/110-netfilter_match_speedup.patch
@@ -132,10 +132,11 @@
e = (struct ipt_entry *)(loc_cpu_entry + off);
if (copy_to_user(userptr + off
-@@ -984,6 +1025,14 @@ copy_entries_to_user(unsigned int total_
+@@ -983,6 +1024,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),
@@ -143,7 +144,6 @@
+ ret = -EFAULT;
+ goto free_counters;
+ }
-+
+
for (i = sizeof(struct ipt_entry);
i < e->target_offset;
- i += m->u.match_size) {