diff options
author | Florian Fainelli <florian@openwrt.org> | 2010-09-12 21:23:15 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2010-09-12 21:23:15 +0000 |
commit | f15861c78539ad0ebb4baa0b4c935a8017e622ed (patch) | |
tree | 144b12a4a84f07d2197a7c675036240a9ec4ee0e /target/linux/generic/patches-2.6.35/110-netfilter_match_speedup.patch | |
parent | f10bd899e621ecf56c0f5d3c55680608eab0c2fa (diff) | |
download | upstream-f15861c78539ad0ebb4baa0b4c935a8017e622ed.tar.gz upstream-f15861c78539ad0ebb4baa0b4c935a8017e622ed.tar.bz2 upstream-f15861c78539ad0ebb4baa0b4c935a8017e622ed.zip |
[kernel] refresh 2.6.35 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23033 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.patch | 8 |
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 7affbb1221..cd840cdc21 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,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_ +@@ -979,6 +1020,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) { |