From 66f9c974c03db283551b7825cffe95a52ca964ad Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Tue, 31 Aug 2010 14:08:30 +0000 Subject: [PATCH] refresh 2.6.32 patches SVN-Revision: 22848 --- ...014-cfi_fix_amd_extended_table_check.patch | 6 +- .../020-mips_multi_machine_support.patch | 2 +- .../040-arm-update-mach-types.patch | 2 +- .../100-netfilter_layer7_2.21.patch | 2 +- .../110-netfilter_match_speedup.patch | 8 +- .../patches-2.6.32/150-netfilter_imq.patch | 4 +- .../202-mips_mem_functions_performance.patch | 2 +- .../patches-2.6.32/203-slab_maxsize.patch | 2 +- .../210-mini_fo_2.6.25_fixes.patch | 4 +- .../212-mini_fo_2.6.26_fixes.patch | 2 +- .../patches-2.6.32/400-ledtrig_morse.patch | 2 +- .../patches-2.6.32/402-ledtrig_netdev.patch | 2 +- .../511-yaffs-cvs-2009-04-24.patch | 76 +++++++++---------- .../patches-2.6.32/903-hostap_txpower.patch | 2 +- .../patches-2.6.32/924-cs5535_gpio.patch | 2 +- .../930-kmsg_dump_backport.patch | 2 +- .../patches-2.6.32/971-ocf_20100325.patch | 2 +- .../patches-2.6.32/975-ssb_update.patch | 10 +-- .../998-openwrt_lzma_options.patch | 2 +- 19 files changed, 67 insertions(+), 67 deletions(-) diff --git a/target/linux/generic/patches-2.6.32/014-cfi_fix_amd_extended_table_check.patch b/target/linux/generic/patches-2.6.32/014-cfi_fix_amd_extended_table_check.patch index 2618fafeb9..7010d367b8 100644 --- a/target/linux/generic/patches-2.6.32/014-cfi_fix_amd_extended_table_check.patch +++ b/target/linux/generic/patches-2.6.32/014-cfi_fix_amd_extended_table_check.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c -@@ -325,6 +325,8 @@ static struct cfi_fixup fixup_table[] = +@@ -325,6 +325,8 @@ static struct cfi_fixup fixup_table[] = static void cfi_fixup_major_minor(struct cfi_private *cfi, struct cfi_pri_amdstd *extp) { @@ -9,7 +9,7 @@ if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e && extp->MajorVersion == '0') extp->MajorVersion = '1'; -@@ -355,6 +357,9 @@ struct mtd_info *cfi_cmdset_0002(struct +@@ -355,6 +357,9 @@ struct mtd_info *cfi_cmdset_0002(struct mtd->name = map->name; mtd->writesize = 1; @@ -19,7 +19,7 @@ if (cfi->cfi_mode==CFI_MODE_CFI){ unsigned char bootloc; /* -@@ -373,16 +378,24 @@ struct mtd_info *cfi_cmdset_0002(struct +@@ -373,16 +378,24 @@ struct mtd_info *cfi_cmdset_0002(struct cfi_fixup_major_minor(cfi, extp); diff --git a/target/linux/generic/patches-2.6.32/020-mips_multi_machine_support.patch b/target/linux/generic/patches-2.6.32/020-mips_multi_machine_support.patch index d53c0c85fc..d73b2d1523 100644 --- a/target/linux/generic/patches-2.6.32/020-mips_multi_machine_support.patch +++ b/target/linux/generic/patches-2.6.32/020-mips_multi_machine_support.patch @@ -176,7 +176,7 @@ unsigned int vced_count, vcei_count; -@@ -31,8 +32,12 @@ static int show_cpuinfo(struct seq_file +@@ -31,8 +32,12 @@ static int show_cpuinfo(struct seq_file /* * For the first processor also print the system type */ diff --git a/target/linux/generic/patches-2.6.32/040-arm-update-mach-types.patch b/target/linux/generic/patches-2.6.32/040-arm-update-mach-types.patch index 84f4820115..9c87fe27e5 100644 --- a/target/linux/generic/patches-2.6.32/040-arm-update-mach-types.patch +++ b/target/linux/generic/patches-2.6.32/040-arm-update-mach-types.patch @@ -37,7 +37,7 @@ sony_prs505 MACH_SONY_PRS505 SONY_PRS505 2007 hanlin_v3 MACH_HANLIN_V3 HANLIN_V3 2008 sapphira MACH_SAPPHIRA SAPPHIRA 2009 -@@ -2256,7 +2257,7 @@ oratisalog MACH_ORATISALOG ORATISALOG +@@ -2256,7 +2257,7 @@ oratisalog MACH_ORATISALOG ORATISALOG oratismadi MACH_ORATISMADI ORATISMADI 2269 oratisot16 MACH_ORATISOT16 ORATISOT16 2270 oratisdesk MACH_ORATISDESK ORATISDESK 2271 diff --git a/target/linux/generic/patches-2.6.32/100-netfilter_layer7_2.21.patch b/target/linux/generic/patches-2.6.32/100-netfilter_layer7_2.21.patch index de9c63c357..be7d97fe12 100644 --- a/target/linux/generic/patches-2.6.32/100-netfilter_layer7_2.21.patch +++ b/target/linux/generic/patches-2.6.32/100-netfilter_layer7_2.21.patch @@ -71,7 +71,7 @@ depends on NETFILTER_ADVANCED --- a/net/netfilter/Makefile +++ b/net/netfilter/Makefile -@@ -89,6 +89,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) +@@ -89,6 +89,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o 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 04ba710274..a9eb1089f5 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,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/patches-2.6.32/150-netfilter_imq.patch b/target/linux/generic/patches-2.6.32/150-netfilter_imq.patch index f6e70d59da..9540ce0dde 100644 --- a/target/linux/generic/patches-2.6.32/150-netfilter_imq.patch +++ b/target/linux/generic/patches-2.6.32/150-netfilter_imq.patch @@ -958,7 +958,7 @@ dev_queue_xmit_nit(skb, dev); if (netif_needs_gso(dev, skb)) { -@@ -1789,8 +1796,7 @@ u16 skb_tx_hash(const struct net_device +@@ -1789,8 +1796,7 @@ u16 skb_tx_hash(const struct net_device } EXPORT_SYMBOL(skb_tx_hash); @@ -1183,7 +1183,7 @@ /* return EBUSY when somebody else is registered, return EEXIST if the * same handler is registered, return 0 in case of success. */ int nf_register_queue_handler(u_int8_t pf, const struct nf_queue_handler *qh) -@@ -80,7 +100,7 @@ void nf_unregister_queue_handlers(const +@@ -80,7 +100,7 @@ void nf_unregister_queue_handlers(const } EXPORT_SYMBOL_GPL(nf_unregister_queue_handlers); diff --git a/target/linux/generic/patches-2.6.32/202-mips_mem_functions_performance.patch b/target/linux/generic/patches-2.6.32/202-mips_mem_functions_performance.patch index e4324717b4..6ea9ba51ee 100644 --- a/target/linux/generic/patches-2.6.32/202-mips_mem_functions_performance.patch +++ b/target/linux/generic/patches-2.6.32/202-mips_mem_functions_performance.patch @@ -1,6 +1,6 @@ --- a/arch/mips/include/asm/string.h +++ b/arch/mips/include/asm/string.h -@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__ +@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__ #define __HAVE_ARCH_MEMSET extern void *memset(void *__s, int __c, size_t __count); diff --git a/target/linux/generic/patches-2.6.32/203-slab_maxsize.patch b/target/linux/generic/patches-2.6.32/203-slab_maxsize.patch index 5bbf9f5f0e..0c1ae72a4e 100644 --- a/target/linux/generic/patches-2.6.32/203-slab_maxsize.patch +++ b/target/linux/generic/patches-2.6.32/203-slab_maxsize.patch @@ -1,6 +1,6 @@ --- a/include/linux/slab.h +++ b/include/linux/slab.h -@@ -124,8 +124,8 @@ int kmem_ptr_validate(struct kmem_cache +@@ -124,8 +124,8 @@ int kmem_ptr_validate(struct kmem_cache * to do various tricks to work around compiler limitations in order to * ensure proper constant folding. */ diff --git a/target/linux/generic/patches-2.6.32/210-mini_fo_2.6.25_fixes.patch b/target/linux/generic/patches-2.6.32/210-mini_fo_2.6.25_fixes.patch index b64630d500..d71e3b6faa 100644 --- a/target/linux/generic/patches-2.6.32/210-mini_fo_2.6.25_fixes.patch +++ b/target/linux/generic/patches-2.6.32/210-mini_fo_2.6.25_fixes.patch @@ -61,7 +61,7 @@ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd); -@@ -501,6 +505,29 @@ static inline void double_unlock(struct +@@ -501,6 +505,29 @@ static inline void double_unlock(struct #endif /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */ #endif /* __KERNEL__ */ @@ -127,7 +127,7 @@ #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */ --- a/fs/mini_fo/aux.c +++ b/fs/mini_fo/aux.c -@@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb, +@@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb, err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd); /* validate */ diff --git a/target/linux/generic/patches-2.6.32/212-mini_fo_2.6.26_fixes.patch b/target/linux/generic/patches-2.6.32/212-mini_fo_2.6.26_fixes.patch index b5fa64e6a1..8bd9ba3244 100644 --- a/target/linux/generic/patches-2.6.32/212-mini_fo_2.6.26_fixes.patch +++ b/target/linux/generic/patches-2.6.32/212-mini_fo_2.6.26_fixes.patch @@ -1,6 +1,6 @@ --- a/fs/mini_fo/super.c +++ b/fs/mini_fo/super.c -@@ -84,6 +84,7 @@ mini_fo_write_inode(inode_t *inode, int +@@ -84,6 +84,7 @@ mini_fo_write_inode(inode_t *inode, int #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */ diff --git a/target/linux/generic/patches-2.6.32/400-ledtrig_morse.patch b/target/linux/generic/patches-2.6.32/400-ledtrig_morse.patch index 4edb071ade..1892eb5bd9 100644 --- a/target/linux/generic/patches-2.6.32/400-ledtrig_morse.patch +++ b/target/linux/generic/patches-2.6.32/400-ledtrig_morse.patch @@ -11,7 +11,7 @@ endif # NEW_LEDS --- a/drivers/leds/Makefile +++ b/drivers/leds/Makefile -@@ -40,3 +40,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += +@@ -40,3 +40,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) += ledtrig-backlight.o obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o diff --git a/target/linux/generic/patches-2.6.32/402-ledtrig_netdev.patch b/target/linux/generic/patches-2.6.32/402-ledtrig_netdev.patch index 11a9c9b1ea..4c02b4dead 100644 --- a/target/linux/generic/patches-2.6.32/402-ledtrig_netdev.patch +++ b/target/linux/generic/patches-2.6.32/402-ledtrig_netdev.patch @@ -14,7 +14,7 @@ endif # NEW_LEDS --- a/drivers/leds/Makefile +++ b/drivers/leds/Makefile -@@ -41,3 +41,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) += +@@ -41,3 +41,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) += obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o diff --git a/target/linux/generic/patches-2.6.32/511-yaffs-cvs-2009-04-24.patch b/target/linux/generic/patches-2.6.32/511-yaffs-cvs-2009-04-24.patch index c334b17d08..5c70e79a05 100644 --- a/target/linux/generic/patches-2.6.32/511-yaffs-cvs-2009-04-24.patch +++ b/target/linux/generic/patches-2.6.32/511-yaffs-cvs-2009-04-24.patch @@ -601,7 +601,7 @@ dev->checkpointBlockList[i] = -1; } -@@ -191,18 +185,17 @@ int yaffs_GetCheckpointSum(yaffs_Device +@@ -191,18 +185,17 @@ int yaffs_GetCheckpointSum(yaffs_Device static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev) { @@ -926,7 +926,7 @@ { unsigned char cDelta; /* column parity delta */ unsigned lDelta; /* line parity delta */ -@@ -294,8 +292,7 @@ int yaffs_ECCCorrectOther(unsigned char +@@ -294,8 +292,7 @@ int yaffs_ECCCorrectOther(unsigned char return 0; /* no error */ if (lDelta == ~lDeltaPrime && @@ -936,7 +936,7 @@ /* Single bit (recoverable) error in data */ bit = 0; -@@ -307,7 +304,7 @@ int yaffs_ECCCorrectOther(unsigned char +@@ -307,7 +304,7 @@ int yaffs_ECCCorrectOther(unsigned char if (cDelta & 0x02) bit |= 0x01; @@ -945,7 +945,7 @@ return -1; data[lDelta] ^= (1 << bit); -@@ -316,7 +313,7 @@ int yaffs_ECCCorrectOther(unsigned char +@@ -316,7 +313,7 @@ int yaffs_ECCCorrectOther(unsigned char } if ((yaffs_CountBits32(lDelta) + yaffs_CountBits32(lDeltaPrime) + @@ -954,7 +954,7 @@ /* Reccoverable error in ecc */ *read_ecc = *test_ecc; -@@ -326,6 +323,4 @@ int yaffs_ECCCorrectOther(unsigned char +@@ -326,6 +323,4 @@ int yaffs_ECCCorrectOther(unsigned char /* Unrecoverable error */ return -1; @@ -1398,7 +1398,7 @@ { unsigned char *alias; int ret; -@@ -329,7 +395,7 @@ static int yaffs_readlink(struct dentry +@@ -329,7 +395,7 @@ static int yaffs_readlink(struct dentry return ret; } @@ -1560,7 +1560,7 @@ static int yaffs_file_flush(struct file *file, fl_owner_t id) #else static int yaffs_file_flush(struct file *file) -@@ -513,8 +579,8 @@ static int yaffs_file_flush(struct file +@@ -513,8 +579,8 @@ static int yaffs_file_flush(struct file yaffs_Device *dev = obj->myDev; T(YAFFS_TRACE_OS, @@ -1571,7 +1571,7 @@ yaffs_GrossLock(dev); -@@ -535,15 +601,15 @@ static int yaffs_readpage_nolock(struct +@@ -535,15 +601,15 @@ static int yaffs_readpage_nolock(struct yaffs_Device *dev; @@ -1591,7 +1591,7 @@ BUG_ON(!PageLocked(pg)); #else if (!PageLocked(pg)) -@@ -555,9 +621,9 @@ static int yaffs_readpage_nolock(struct +@@ -555,9 +621,9 @@ static int yaffs_readpage_nolock(struct yaffs_GrossLock(dev); @@ -1604,7 +1604,7 @@ yaffs_GrossUnlock(dev); -@@ -575,7 +641,7 @@ static int yaffs_readpage_nolock(struct +@@ -575,7 +641,7 @@ static int yaffs_readpage_nolock(struct flush_dcache_page(pg); kunmap(pg); @@ -3193,7 +3193,7 @@ if (n < step) { n++; continue; -@@ -2119,7 +2356,7 @@ static int yaffs_proc_write(struct file +@@ -2119,7 +2356,7 @@ static int yaffs_proc_write(struct file char *end; char *mask_name; const char *x; @@ -3202,7 +3202,7 @@ int i; int done = 0; int add, len = 0; -@@ -2129,9 +2366,8 @@ static int yaffs_proc_write(struct file +@@ -2129,9 +2366,8 @@ static int yaffs_proc_write(struct file while (!done && (pos < count)) { done = 1; @@ -3213,7 +3213,7 @@ switch (buf[pos]) { case '+': -@@ -2148,20 +2384,21 @@ static int yaffs_proc_write(struct file +@@ -2148,20 +2384,21 @@ static int yaffs_proc_write(struct file mask_name = NULL; mask_bitfield = simple_strtoul(buf + pos, &end, 0); @@ -3240,7 +3240,7 @@ mask_name = mask_flags[i].mask_name; mask_bitfield = mask_flags[i].mask_bitfield; done = 0; -@@ -2172,7 +2409,7 @@ static int yaffs_proc_write(struct file +@@ -2172,7 +2409,7 @@ static int yaffs_proc_write(struct file if (mask_name != NULL) { done = 0; @@ -3249,7 +3249,7 @@ case '-': rg &= ~mask_bitfield; break; -@@ -2191,13 +2428,13 @@ static int yaffs_proc_write(struct file +@@ -2191,13 +2428,13 @@ static int yaffs_proc_write(struct file yaffs_traceMask = rg | YAFFS_TRACE_ALWAYS; @@ -5691,7 +5691,7 @@ { /* Get the real object in case we were fed a hard link as an equivalent object */ equivalentObject = yaffs_GetEquivalentObject(equivalentObject); -@@ -2363,33 +2396,31 @@ yaffs_Object *yaffs_Link(yaffs_Object * +@@ -2363,33 +2396,31 @@ yaffs_Object *yaffs_Link(yaffs_Object * } @@ -7622,7 +7622,7 @@ int nToCopy; int n = nBytes; int nDone = 0; -@@ -4600,27 +4665,26 @@ int yaffs_ReadDataFromFile(yaffs_Object +@@ -4600,27 +4665,26 @@ int yaffs_ReadDataFromFile(yaffs_Object dev = in->myDev; while (n > 0) { @@ -7657,7 +7657,7 @@ if (dev->nShortOpCaches > 0) { /* If we can't find the data in the cache, then load it up. */ -@@ -4641,14 +4705,9 @@ int yaffs_ReadDataFromFile(yaffs_Object +@@ -4641,14 +4705,9 @@ int yaffs_ReadDataFromFile(yaffs_Object cache->locked = 1; @@ -7673,7 +7673,7 @@ cache->locked = 0; } else { /* Read into the local buffer then copy..*/ -@@ -4657,41 +4716,19 @@ int yaffs_ReadDataFromFile(yaffs_Object +@@ -4657,41 +4716,19 @@ int yaffs_ReadDataFromFile(yaffs_Object yaffs_GetTempBuffer(dev, __LINE__); yaffs_ReadChunkDataFromObject(in, chunk, localBuffer); @@ -7718,7 +7718,7 @@ } n -= nToCopy; -@@ -4704,28 +4741,37 @@ int yaffs_ReadDataFromFile(yaffs_Object +@@ -4704,28 +4741,37 @@ int yaffs_ReadDataFromFile(yaffs_Object return nDone; } @@ -7923,7 +7923,7 @@ int newFullChunks; yaffs_Device *dev = in->myDev; -@@ -4955,13 +4981,11 @@ int yaffs_ResizeFile(yaffs_Object * in, +@@ -4955,13 +4981,11 @@ int yaffs_ResizeFile(yaffs_Object * in, yaffs_CheckGarbageCollection(dev); @@ -7941,7 +7941,7 @@ if (newSize < oldFileSize) { -@@ -4994,21 +5018,20 @@ int yaffs_ResizeFile(yaffs_Object * in, +@@ -4994,21 +5018,20 @@ int yaffs_ResizeFile(yaffs_Object * in, } @@ -7968,7 +7968,7 @@ { obj = yaffs_GetEquivalentObject(obj); -@@ -5024,7 +5047,7 @@ loff_t yaffs_GetFileSize(yaffs_Object * +@@ -5024,7 +5047,7 @@ loff_t yaffs_GetFileSize(yaffs_Object * @@ -9789,7 +9789,7 @@ { int init_failed = 0; unsigned x; -@@ -7040,6 +7126,8 @@ int yaffs_GutsInitialise(yaffs_Device * +@@ -7040,6 +7126,8 @@ int yaffs_GutsInitialise(yaffs_Device * dev->chunkOffset = 0; dev->nFreeChunks = 0; @@ -9798,7 +9798,7 @@ if (dev->startBlock == 0) { dev->internalStartBlock = dev->startBlock + 1; dev->internalEndBlock = dev->endBlock + 1; -@@ -7049,18 +7137,18 @@ int yaffs_GutsInitialise(yaffs_Device * +@@ -7049,18 +7137,18 @@ int yaffs_GutsInitialise(yaffs_Device * /* Check geometry parameters. */ @@ -9823,7 +9823,7 @@ return YAFFS_FAIL; } -@@ -7070,6 +7158,12 @@ int yaffs_GutsInitialise(yaffs_Device * +@@ -7070,6 +7158,12 @@ int yaffs_GutsInitialise(yaffs_Device * return YAFFS_FAIL; } @@ -9836,7 +9836,7 @@ /* Got the right mix of functions? */ if (!yaffs_CheckDevFunctions(dev)) { /* Function missing */ -@@ -7097,31 +7191,18 @@ int yaffs_GutsInitialise(yaffs_Device * +@@ -7097,31 +7191,18 @@ int yaffs_GutsInitialise(yaffs_Device * dev->isMounted = 1; @@ -9875,7 +9875,7 @@ /* * Calculate chunkGroupBits. -@@ -7133,16 +7214,15 @@ int yaffs_GutsInitialise(yaffs_Device * +@@ -7133,16 +7214,15 @@ int yaffs_GutsInitialise(yaffs_Device * bits = ShiftsGE(x); /* Set up tnode width if wide tnodes are enabled. */ @@ -9896,7 +9896,7 @@ dev->tnodeWidth = 16; dev->tnodeMask = (1<tnodeWidth)-1; -@@ -7193,7 +7273,7 @@ int yaffs_GutsInitialise(yaffs_Device * +@@ -7193,7 +7273,7 @@ int yaffs_GutsInitialise(yaffs_Device * dev->hasPendingPrioritisedGCs = 1; /* Assume the worst for now, will get fixed on first GC */ /* Initialise temporary buffers and caches. */ @@ -9905,7 +9905,7 @@ init_failed = 1; dev->srCache = NULL; -@@ -7203,25 +7283,26 @@ int yaffs_GutsInitialise(yaffs_Device * +@@ -7203,25 +7283,26 @@ int yaffs_GutsInitialise(yaffs_Device * if (!init_failed && dev->nShortOpCaches > 0) { int i; @@ -9940,7 +9940,7 @@ init_failed = 1; dev->srLastUse = 0; -@@ -7229,29 +7310,30 @@ int yaffs_GutsInitialise(yaffs_Device * +@@ -7229,29 +7310,30 @@ int yaffs_GutsInitialise(yaffs_Device * dev->cacheHits = 0; @@ -9979,7 +9979,7 @@ T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: restored from checkpoint" TENDSTR))); } else { -@@ -7273,24 +7355,25 @@ int yaffs_GutsInitialise(yaffs_Device * +@@ -7273,24 +7355,25 @@ int yaffs_GutsInitialise(yaffs_Device * dev->nBackgroundDeletions = 0; dev->oldestDirtySequence = 0; @@ -10011,7 +10011,7 @@ /* Clean up the mess */ T(YAFFS_TRACE_TRACING, (TSTR("yaffs: yaffs_GutsInitialise() aborted.\n" TENDSTR))); -@@ -7318,7 +7401,7 @@ int yaffs_GutsInitialise(yaffs_Device * +@@ -7318,7 +7401,7 @@ int yaffs_GutsInitialise(yaffs_Device * } @@ -10710,7 +10710,7 @@ { if (etags) { memset(etags, 0, sizeof(*etags)); -@@ -169,9 +169,9 @@ static int rettags(yaffs_ExtendedTags * +@@ -169,9 +169,9 @@ static int rettags(yaffs_ExtendedTags * * Returns YAFFS_OK or YAFFS_FAIL. */ int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev, @@ -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 diff --git a/target/linux/generic/patches-2.6.32/903-hostap_txpower.patch b/target/linux/generic/patches-2.6.32/903-hostap_txpower.patch index 22a65924da..7552ceb33d 100644 --- a/target/linux/generic/patches-2.6.32/903-hostap_txpower.patch +++ b/target/linux/generic/patches-2.6.32/903-hostap_txpower.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/hostap/hostap_ap.c +++ b/drivers/net/wireless/hostap/hostap_ap.c -@@ -2335,13 +2335,13 @@ int prism2_ap_get_sta_qual(local_info_t +@@ -2335,13 +2335,13 @@ int prism2_ap_get_sta_qual(local_info_t addr[count].sa_family = ARPHRD_ETHER; memcpy(addr[count].sa_data, sta->addr, ETH_ALEN); if (sta->last_rx_silence == 0) diff --git a/target/linux/generic/patches-2.6.32/924-cs5535_gpio.patch b/target/linux/generic/patches-2.6.32/924-cs5535_gpio.patch index a36ea49933..453affe583 100644 --- a/target/linux/generic/patches-2.6.32/924-cs5535_gpio.patch +++ b/target/linux/generic/patches-2.6.32/924-cs5535_gpio.patch @@ -8,7 +8,7 @@ #include #include #include -@@ -48,6 +49,7 @@ static struct pci_device_id divil_pci[] +@@ -48,6 +49,7 @@ static struct pci_device_id divil_pci[] MODULE_DEVICE_TABLE(pci, divil_pci); static struct cdev cs5535_gpio_cdev; diff --git a/target/linux/generic/patches-2.6.32/930-kmsg_dump_backport.patch b/target/linux/generic/patches-2.6.32/930-kmsg_dump_backport.patch index cd4d0f7756..4b0369059e 100644 --- a/target/linux/generic/patches-2.6.32/930-kmsg_dump_backport.patch +++ b/target/linux/generic/patches-2.6.32/930-kmsg_dump_backport.patch @@ -55,7 +55,7 @@ #include #include #include -@@ -74,6 +75,7 @@ NORET_TYPE void panic(const char * fmt, +@@ -74,6 +75,7 @@ NORET_TYPE void panic(const char * fmt, dump_stack(); #endif diff --git a/target/linux/generic/patches-2.6.32/971-ocf_20100325.patch b/target/linux/generic/patches-2.6.32/971-ocf_20100325.patch index 8eff02fa6c..0b0c1e279c 100644 --- a/target/linux/generic/patches-2.6.32/971-ocf_20100325.patch +++ b/target/linux/generic/patches-2.6.32/971-ocf_20100325.patch @@ -24,7 +24,7 @@ * All of these routines try to estimate how many bits of randomness a * particular randomness source. They do this by keeping track of the * first and second order deltas of the event timings. -@@ -714,6 +724,61 @@ void add_disk_randomness(struct gendisk +@@ -714,6 +724,61 @@ void add_disk_randomness(struct gendisk } #endif diff --git a/target/linux/generic/patches-2.6.32/975-ssb_update.patch b/target/linux/generic/patches-2.6.32/975-ssb_update.patch index 373df1a62d..0cb8483021 100644 --- a/target/linux/generic/patches-2.6.32/975-ssb_update.patch +++ b/target/linux/generic/patches-2.6.32/975-ssb_update.patch @@ -343,10 +343,7 @@ +static int ssb_pcmcia_get_mac(struct pcmcia_device *p_dev, + tuple_t *tuple, + void *priv) - { -- tuple_t tuple; -- int res; -- unsigned char buf[32]; ++{ + struct ssb_sprom *sprom = priv; + + if (tuple->TupleData[0] != CISTPL_FUNCE_LAN_NODE_ID) @@ -362,7 +359,10 @@ +static int ssb_pcmcia_do_get_invariants(struct pcmcia_device *p_dev, + tuple_t *tuple, + void *priv) -+{ + { +- tuple_t tuple; +- int res; +- unsigned char buf[32]; + struct ssb_init_invariants *iv = priv; struct ssb_sprom *sprom = &iv->sprom; struct ssb_boardinfo *bi = &iv->boardinfo; diff --git a/target/linux/generic/patches-2.6.32/998-openwrt_lzma_options.patch b/target/linux/generic/patches-2.6.32/998-openwrt_lzma_options.patch index f81e22f116..face9154d8 100644 --- a/target/linux/generic/patches-2.6.32/998-openwrt_lzma_options.patch +++ b/target/linux/generic/patches-2.6.32/998-openwrt_lzma_options.patch @@ -1,6 +1,6 @@ --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib -@@ -228,7 +228,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) +@@ -228,7 +228,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) quiet_cmd_lzma = LZMA $@ cmd_lzma = (cat $(filter-out FORCE,$^) | \