summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.32/110-netfilter_match_speedup.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-02-21 02:06:51 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-02-21 02:06:51 +0000
commit55664ae04b97d1be20b1576bf2da0902113106fd (patch)
tree1d791e657466b8167976c79ad93ba97d1183d8a8 /target/linux/generic/patches-2.6.32/110-netfilter_match_speedup.patch
parent5e317a6c8773fc0ed62d74f67996bc4eac01f206 (diff)
kernel: remove imq support, refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25641 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.32/110-netfilter_match_speedup.patch')
-rw-r--r--target/linux/generic/patches-2.6.32/110-netfilter_match_speedup.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-2.6.32/110-netfilter_match_speedup.patch b/target/linux/generic/patches-2.6.32/110-netfilter_match_speedup.patch
index 04ba71027..a9eb1089f 100644
--- a/target/linux/generic/patches-2.6.32/110-netfilter_match_speedup.patch
+++ b/target/linux/generic/patches-2.6.32/110-netfilter_match_speedup.patch
@@ -127,11 +127,10 @@
e = (struct ipt_entry *)(loc_cpu_entry + off);
if (copy_to_user(userptr + off
-@@ -1001,6 +1041,14 @@ copy_entries_to_user(unsigned int total_
- ret = -EFAULT;
+@@ -1002,6 +1042,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) {