diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2010-05-23 13:17:32 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2010-05-23 13:17:32 +0000 |
| commit | cfb92685072475fa57c34599426364c703d00fa4 (patch) | |
| tree | 866365090b64dca328a506afe45461b4521a65bd /target/linux/generic-2.6/patches-2.6.33 | |
| parent | 0710ef015da0c48ededae7d46a21a19a2ec9c5dd (diff) | |
| download | master-187ad058-cfb92685072475fa57c34599426364c703d00fa4.tar.gz master-187ad058-cfb92685072475fa57c34599426364c703d00fa4.tar.bz2 master-187ad058-cfb92685072475fa57c34599426364c703d00fa4.zip | |
generic-2.6: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21542 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.33')
3 files changed, 11 insertions, 13 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.33/088-winbond_cmdset.patch b/target/linux/generic-2.6/patches-2.6.33/088-winbond_cmdset.patch index d4e42b0aa2..d5889ce62d 100644 --- a/target/linux/generic-2.6/patches-2.6.33/088-winbond_cmdset.patch +++ b/target/linux/generic-2.6/patches-2.6.33/088-winbond_cmdset.patch @@ -1,8 +1,6 @@ -Index: linux-2.6.32.12/drivers/mtd/chips/gen_probe.c -=================================================================== ---- linux-2.6.32.12.orig/drivers/mtd/chips/gen_probe.c 2010-05-03 10:48:00.000000000 +0200 -+++ linux-2.6.32.12/drivers/mtd/chips/gen_probe.c 2010-05-03 10:48:16.000000000 +0200 -@@ -249,6 +249,7 @@ +--- a/drivers/mtd/chips/gen_probe.c ++++ b/drivers/mtd/chips/gen_probe.c +@@ -249,6 +249,7 @@ static struct mtd_info *check_cmd_set(st #endif #ifdef CONFIG_MTD_CFI_AMDSTD case 0x0002: diff --git a/target/linux/generic-2.6/patches-2.6.33/110-netfilter_match_speedup.patch b/target/linux/generic-2.6/patches-2.6.33/110-netfilter_match_speedup.patch index ca64e6c3ef..e99c6db4d1 100644 --- a/target/linux/generic-2.6/patches-2.6.33/110-netfilter_match_speedup.patch +++ b/target/linux/generic-2.6/patches-2.6.33/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) { diff --git a/target/linux/generic-2.6/patches-2.6.33/511-yaffs-cvs-2009-04-24.patch b/target/linux/generic-2.6/patches-2.6.33/511-yaffs-cvs-2009-04-24.patch index c334b17d08..c40da10d69 100644 --- a/target/linux/generic-2.6/patches-2.6.33/511-yaffs-cvs-2009-04-24.patch +++ b/target/linux/generic-2.6/patches-2.6.33/511-yaffs-cvs-2009-04-24.patch @@ -11038,14 +11038,14 @@ + yaffs_UnpackTags2(tags, &pt); + } + } -+ + +- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR) +- tags->eccResult = YAFFS_ECC_RESULT_UNFIXED; + if (localData) + yaffs_ReleaseTempBuffer(dev, data, __LINE__); -- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR) + if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR) - tags->eccResult = YAFFS_ECC_RESULT_UNFIXED; -- ++ tags->eccResult = YAFFS_ECC_RESULT_UNFIXED; if (retval == 0) return YAFFS_OK; else |