summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.35/110-netfilter_match_speedup.patch
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-08-25 19:56:03 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-08-25 19:56:03 +0000
commit5bf465d7727101802f1e87f869729078013d871f (patch)
treeb786f9afe82ef8da922243e09ea8b24fcc34230b /target/linux/generic/patches-2.6.35/110-netfilter_match_speedup.patch
parenta86afacc844c374113babee00ee30c3395ff5a9f (diff)
[kernel] refresh 2.6.35 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22799 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.35/110-netfilter_match_speedup.patch')
-rw-r--r--target/linux/generic/patches-2.6.35/110-netfilter_match_speedup.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-2.6.35/110-netfilter_match_speedup.patch b/target/linux/generic/patches-2.6.35/110-netfilter_match_speedup.patch
index cd840cdc2..7affbb122 100644
--- a/target/linux/generic/patches-2.6.35/110-netfilter_match_speedup.patch
+++ b/target/linux/generic/patches-2.6.35/110-netfilter_match_speedup.patch
@@ -132,11 +132,10 @@
e = (struct ipt_entry *)(loc_cpu_entry + off);
if (copy_to_user(userptr + off
-@@ -979,6 +1020,14 @@ copy_entries_to_user(unsigned int total_
- ret = -EFAULT;
+@@ -980,6 +1021,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),
@@ -144,6 +143,7 @@
+ ret = -EFAULT;
+ goto free_counters;
+ }
-
++
for (i = sizeof(struct ipt_entry);
i < e->target_offset;
+ i += m->u.match_size) {