diff options
| author | acoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-10-05 08:50:54 +0000 |
|---|---|---|
| committer | acoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-10-05 08:50:54 +0000 |
| commit | b74489d910ba0c22c30fc3db6d9f1c316c7333a8 (patch) | |
| tree | 0c8716c5e67d2f8142dc9e18a5bac307c709c041 /target/linux/generic/patches-2.6.36/110-netfilter_match_speedup.patch | |
| parent | 768e3f0496554d89a23b312eb2d50d9af5c2ce62 (diff) | |
linux/generic: refresh 2.6.36 kernel patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23237 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.patch | 10 |
1 files changed, 5 insertions, 5 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 7affbb122..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 @@ -124,7 +124,7 @@ pr_debug("Entering %s(hook %u); sp at %u (UF %p)\n", table->name, hook, origptr, get_entry(table_base, private->underflow[hook])); -@@ -970,6 +1010,7 @@ copy_entries_to_user(unsigned int total_ +@@ -974,6 +1014,7 @@ copy_entries_to_user(unsigned int total_ unsigned int i; const struct ipt_entry_match *m; const struct ipt_entry_target *t; @@ -132,10 +132,11 @@ e = (struct ipt_entry *)(loc_cpu_entry + off); if (copy_to_user(userptr + off -@@ -980,6 +1021,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) { |