diff options
author | Felix Fietkau <nbd@openwrt.org> | 2011-02-21 02:06:51 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2011-02-21 02:06:51 +0000 |
commit | d41be9f54b921eefdb73c625d87225a48ce436f4 (patch) | |
tree | 1d791e657466b8167976c79ad93ba97d1183d8a8 /target/linux/generic/patches-2.6.35/110-netfilter_match_speedup.patch | |
parent | 23ddbf6c6f22bed96c6a4e76eb5bf5ab293202ba (diff) | |
download | upstream-d41be9f54b921eefdb73c625d87225a48ce436f4.tar.gz upstream-d41be9f54b921eefdb73c625d87225a48ce436f4.tar.bz2 upstream-d41be9f54b921eefdb73c625d87225a48ce436f4.zip |
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.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 cd840cdc21..7affbb1221 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) { |