diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2011-03-13 17:12:20 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2011-03-13 17:12:20 +0000 |
| commit | 1968a3c5fd3a54aa60e98752b1439199b12fba3d (patch) | |
| tree | 0cab5dc0ba19ab8002641c006e711bdceab671d3 /target/linux/generic/patches-2.6.32/110-netfilter_match_speedup.patch | |
| parent | f564424e07d7f1b2f59ea9303b80e5cc45958921 (diff) | |
| download | upstream-1968a3c5fd3a54aa60e98752b1439199b12fba3d.tar.gz upstream-1968a3c5fd3a54aa60e98752b1439199b12fba3d.tar.bz2 upstream-1968a3c5fd3a54aa60e98752b1439199b12fba3d.zip | |
kernel: update to kernel version 2.6.32.32
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26124 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.patch | 8 |
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 a9eb1089f5..04ba710274 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,10 +127,11 @@ e = (struct ipt_entry *)(loc_cpu_entry + off); if (copy_to_user(userptr + off -@@ -1002,6 +1042,14 @@ copy_entries_to_user(unsigned int total_ +@@ -1001,6 +1041,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), @@ -138,7 +139,6 @@ + ret = -EFAULT; + goto free_counters; + } -+ + for (i = sizeof(struct ipt_entry); i < e->target_offset; - i += m->u.match_size) { |