Date:2010-08-22 19:08:37 (13 years 7 months ago)
Author:florian
Commit:56572f716fc33a0e156f4de138be381e118e88e6
Message:[kernel] update to 2.6.34.5

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22768 3c298f89-4303-0410-b956-a3cf2f4a3e73
Files: target/linux/brcm47xx/patches-2.6.34/015-MIPS-BCM47xx-nvram_getenv-fix-return-value.patch (2 diffs)
target/linux/brcm47xx/patches-2.6.34/211-b44_timeout_spam.patch (1 diff)
target/linux/brcm47xx/patches-2.6.34/310-no_highpage.patch (1 diff)
target/linux/brcm47xx/patches-2.6.34/400-arch-bcm47xx.patch (1 diff)
target/linux/brcm47xx/patches-2.6.34/700-ssb-gigabit-ethernet-driver.patch (6 diffs)
target/linux/brcm47xx/patches-2.6.34/940-bcm47xx-yenta.patch (1 diff)
target/linux/generic/patches-2.6.34/014-cfi_fix_amd_extended_table_check.patch (3 diffs)
target/linux/generic/patches-2.6.34/020-mips_multi_machine_support.patch (1 diff)
target/linux/generic/patches-2.6.34/080-mtd_plat_nand_chip_fixup.patch (1 diff)
target/linux/generic/patches-2.6.34/100-netfilter_layer7_2.21.patch (1 diff)
target/linux/generic/patches-2.6.34/110-netfilter_match_speedup.patch (2 diffs)
target/linux/generic/patches-2.6.34/150-netfilter_imq.patch (1 diff)
target/linux/generic/patches-2.6.34/202-mips_mem_functions_performance.patch (1 diff)
target/linux/generic/patches-2.6.34/203-slab_maxsize.patch (1 diff)
target/linux/generic/patches-2.6.34/210-mini_fo_2.6.25_fixes.patch (2 diffs)
target/linux/generic/patches-2.6.34/212-mini_fo_2.6.26_fixes.patch (1 diff)
target/linux/generic/patches-2.6.34/400-ledtrig_morse.patch (1 diff)
target/linux/generic/patches-2.6.34/402-ledtrig_netdev.patch (1 diff)
target/linux/generic/patches-2.6.34/511-yaffs-cvs-2009-04-24.patch (35 diffs)
target/linux/generic/patches-2.6.34/903-hostap_txpower.patch (1 diff)
target/linux/generic/patches-2.6.34/924-cs5535_gpio.patch (1 diff)
target/linux/generic/patches-2.6.34/971-ocf_20100325.patch (1 diff)
target/linux/generic/patches-2.6.34/975-ssb_update.patch (4 diffs)
target/linux/generic/patches-2.6.34/977-ssb_export_fallback_sprom.patch (1 diff)
target/linux/generic/patches-2.6.34/998-openwrt_lzma_options.patch (1 diff)

Change Details

target/linux/brcm47xx/patches-2.6.34/015-MIPS-BCM47xx-nvram_getenv-fix-return-value.patch
1515
1616--- a/arch/mips/bcm47xx/nvram.c
1717+++ b/arch/mips/bcm47xx/nvram.c
18@@ -69,7 +69,7 @@ int nvram_getenv(char *name, char *val,
18@@ -69,7 +69,7 @@ int nvram_getenv(char *name, char *val,
1919     char *var, *value, *end, *eq;
2020
2121     if (!name)
...... 
2424
2525     if (!nvram_buf[0])
2626         early_nvram_init();
27@@ -89,6 +89,6 @@ int nvram_getenv(char *name, char *val,
27@@ -89,6 +89,6 @@ int nvram_getenv(char *name, char *val,
2828             return 0;
2929         }
3030     }
target/linux/brcm47xx/patches-2.6.34/211-b44_timeout_spam.patch
11--- a/drivers/net/b44.c
22+++ b/drivers/net/b44.c
3@@ -188,10 +188,11 @@ static int b44_wait_bit(struct b44 *bp,
3@@ -188,10 +188,11 @@ static int b44_wait_bit(struct b44 *bp,
44         udelay(10);
55     }
66     if (i == timeout) {
target/linux/brcm47xx/patches-2.6.34/310-no_highpage.patch
88 #include <asm/io.h>
99
1010 extern void build_clear_page(void);
11@@ -78,13 +79,16 @@ static inline void clear_user_page(void
11@@ -78,13 +79,16 @@ static inline void clear_user_page(void
1212         flush_data_cache_page((unsigned long)addr);
1313 }
1414
target/linux/brcm47xx/patches-2.6.34/400-arch-bcm47xx.patch
11--- a/arch/mips/bcm47xx/nvram.c
22+++ b/arch/mips/bcm47xx/nvram.c
3@@ -92,3 +92,30 @@ int nvram_getenv(char *name, char *val,
4     return -9;
3@@ -92,3 +92,30 @@ int nvram_getenv(char *name, char *val,
4     return NVRAM_ERR_ENVNOTFOUND;
55 }
66 EXPORT_SYMBOL(nvram_getenv);
77+
target/linux/brcm47xx/patches-2.6.34/700-ssb-gigabit-ethernet-driver.patch
88
99 #include <net/checksum.h>
1010 #include <net/ip.h>
11@@ -471,8 +472,9 @@ static void _tw32_flush(struct tg3 *tp,
11@@ -471,8 +472,9 @@ static void _tw32_flush(struct tg3 *tp,
1212 static inline void tw32_mailbox_flush(struct tg3 *tp, u32 off, u32 val)
1313 {
1414     tp->write32_mbox(tp, off, val);
...... 
6161 {
6262     u32 frame_val;
6363     unsigned int loops;
64@@ -848,7 +855,7 @@ static int tg3_writephy(struct tg3 *tp,
64@@ -848,7 +855,7 @@ static int tg3_writephy(struct tg3 *tp,
6565         udelay(80);
6666     }
6767
...... 
7070               MI_COM_PHY_ADDR_MASK);
7171     frame_val |= ((reg << MI_COM_REG_ADDR_SHIFT) &
7272               MI_COM_REG_ADDR_MASK);
73@@ -881,6 +888,11 @@ static int tg3_writephy(struct tg3 *tp,
73@@ -881,6 +888,11 @@ static int tg3_writephy(struct tg3 *tp,
7474     return ret;
7575 }
7676
...... 
147147     tw32(GRC_MODE, tp->grc_mode);
148148
149149     if (tp->pci_chip_rev_id == CHIPREV_ID_5705_A0) {
150@@ -7135,9 +7173,12 @@ static int tg3_halt_cpu(struct tg3 *tp,
150@@ -7135,9 +7173,12 @@ static int tg3_halt_cpu(struct tg3 *tp,
151151         return -ENODEV;
152152     }
153153
...... 
175175     fw_data = (void *)tp->fw->data;
176176
177177     /* Firmware blob starts with version numbers, followed by
178@@ -7256,6 +7302,11 @@ static int tg3_load_tso_firmware(struct
178@@ -7256,6 +7302,11 @@ static int tg3_load_tso_firmware(struct
179179     unsigned long cpu_base, cpu_scratch_base, cpu_scratch_size;
180180     int err, i;
181181
...... 
242242     tw32_f(GRC_EEPROM_ADDR,
243243          (EEPROM_ADDR_FSM_RESET |
244244           (EEPROM_DEFAULT_CLOCK_PERIOD <<
245@@ -12020,6 +12087,9 @@ static int tg3_nvram_write_block(struct
245@@ -12020,6 +12087,9 @@ static int tg3_nvram_write_block(struct
246246 {
247247     int ret;
248248
target/linux/brcm47xx/patches-2.6.34/940-bcm47xx-yenta.patch
2828     dev_printk(KERN_INFO, &socket->dev->dev,
2929            "ISA IRQ mask 0x%04x, PCI irq %d\n",
3030            socket->socket.irq_mask, socket->cb_irq);
31@@ -1261,6 +1268,15 @@ static int __devinit yenta_probe(struct
31@@ -1261,6 +1268,15 @@ static int __devinit yenta_probe(struct
3232     dev_printk(KERN_INFO, &dev->dev,
3333            "Socket status: %08x\n", cb_readl(socket, CB_SOCKET_STATE));
3434
target/linux/generic/patches-2.6.34/014-cfi_fix_amd_extended_table_check.patch
11--- a/drivers/mtd/chips/cfi_cmdset_0002.c
22+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
3@@ -325,6 +325,8 @@ static struct cfi_fixup fixup_table[] =
3@@ -325,6 +325,8 @@ static struct cfi_fixup fixup_table[] =
44 static void cfi_fixup_major_minor(struct cfi_private *cfi,
55                   struct cfi_pri_amdstd *extp)
66 {
...... 
99     if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e &&
1010         extp->MajorVersion == '0')
1111         extp->MajorVersion = '1';
12@@ -355,6 +357,9 @@ struct mtd_info *cfi_cmdset_0002(struct
12@@ -355,6 +357,9 @@ struct mtd_info *cfi_cmdset_0002(struct
1313     mtd->name = map->name;
1414     mtd->writesize = 1;
1515
...... 
1919     if (cfi->cfi_mode==CFI_MODE_CFI){
2020         unsigned char bootloc;
2121         /*
22@@ -373,16 +378,24 @@ struct mtd_info *cfi_cmdset_0002(struct
22@@ -373,16 +378,24 @@ struct mtd_info *cfi_cmdset_0002(struct
2323
2424         cfi_fixup_major_minor(cfi, extp);
2525
target/linux/generic/patches-2.6.34/020-mips_multi_machine_support.patch
176176
177177 unsigned int vced_count, vcei_count;
178178
179@@ -31,8 +32,12 @@ static int show_cpuinfo(struct seq_file
179@@ -31,8 +32,12 @@ static int show_cpuinfo(struct seq_file
180180     /*
181181      * For the first processor also print the system type
182182      */
target/linux/generic/patches-2.6.34/080-mtd_plat_nand_chip_fixup.patch
1616     /* Scan to find existance of the device */
1717- if (nand_scan(&data->mtd, pdata->chip.nr_chips)) {
1818+ if (nand_scan_ident(&data->mtd, pdata->chip.nr_chips)) {
19+ res = -ENXIO;
19+ err = -ENXIO;
2020+ goto out;
2121+ }
2222+
2323+ if (pdata->chip.chip_fixup) {
24+ res = pdata->chip.chip_fixup(&data->mtd);
25+ if (res)
24+ err = pdata->chip.chip_fixup(&data->mtd);
25+ if (err)
2626+ goto out;
2727+ }
2828+
target/linux/generic/patches-2.6.34/100-netfilter_layer7_2.21.patch
7171     depends on NETFILTER_ADVANCED
7272--- a/net/netfilter/Makefile
7373+++ b/net/netfilter/Makefile
74@@ -90,6 +90,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT)
74@@ -90,6 +90,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT)
7575 obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
7676 obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o
7777 obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
target/linux/generic/patches-2.6.34/110-netfilter_match_speedup.patch
127127
128128         e = (struct ipt_entry *)(loc_cpu_entry + off);
129129         if (copy_to_user(userptr + off
130@@ -1001,6 +1041,14 @@ copy_entries_to_user(unsigned int total_
130@@ -1000,6 +1040,14 @@ copy_entries_to_user(unsigned int total_
131             ret = -EFAULT;
131132             goto free_counters;
132133         }
133
134+
134135+ flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
135136+ if (copy_to_user(userptr + off
136137+ + offsetof(struct ipt_entry, ip.flags),
...... 
138139+ ret = -EFAULT;
139140+ goto free_counters;
140141+ }
141+
142
142143         for (i = sizeof(struct ipt_entry);
143144              i < e->target_offset;
144              i += m->u.match_size) {
target/linux/generic/patches-2.6.34/150-netfilter_imq.patch
11831183 /* return EBUSY when somebody else is registered, return EEXIST if the
11841184  * same handler is registered, return 0 in case of success. */
11851185 int nf_register_queue_handler(u_int8_t pf, const struct nf_queue_handler *qh)
1186@@ -81,7 +101,7 @@ void nf_unregister_queue_handlers(const
1186@@ -81,7 +101,7 @@ void nf_unregister_queue_handlers(const
11871187 }
11881188 EXPORT_SYMBOL_GPL(nf_unregister_queue_handlers);
11891189
target/linux/generic/patches-2.6.34/202-mips_mem_functions_performance.patch
11--- a/arch/mips/include/asm/string.h
22+++ b/arch/mips/include/asm/string.h
3@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__
3@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__
44
55 #define __HAVE_ARCH_MEMSET
66 extern void *memset(void *__s, int __c, size_t __count);
target/linux/generic/patches-2.6.34/203-slab_maxsize.patch
11--- a/include/linux/slab.h
22+++ b/include/linux/slab.h
3@@ -130,8 +130,8 @@ int kmem_ptr_validate(struct kmem_cache
3@@ -130,8 +130,8 @@ int kmem_ptr_validate(struct kmem_cache
44  * to do various tricks to work around compiler limitations in order to
55  * ensure proper constant folding.
66  */
target/linux/generic/patches-2.6.34/210-mini_fo_2.6.25_fixes.patch
6161 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
6262 extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
6363
64@@ -501,6 +505,29 @@ static inline void double_unlock(struct
64@@ -501,6 +505,29 @@ static inline void double_unlock(struct
6565 #endif /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
6666 #endif /* __KERNEL__ */
6767
...... 
127127 #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
128128--- a/fs/mini_fo/aux.c
129129+++ b/fs/mini_fo/aux.c
130@@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb,
130@@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb,
131131     err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
132132
133133     /* validate */
target/linux/generic/patches-2.6.34/212-mini_fo_2.6.26_fixes.patch
11--- a/fs/mini_fo/super.c
22+++ b/fs/mini_fo/super.c
3@@ -84,6 +84,7 @@ mini_fo_write_inode(inode_t *inode, int
3@@ -84,6 +84,7 @@ mini_fo_write_inode(inode_t *inode, int
44 #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
55
66
target/linux/generic/patches-2.6.34/400-ledtrig_morse.patch
1111 endif # NEW_LEDS
1212--- a/drivers/leds/Makefile
1313+++ b/drivers/leds/Makefile
14@@ -46,3 +46,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) +=
14@@ -46,3 +46,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) +=
1515 obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) += ledtrig-backlight.o
1616 obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o
1717 obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
target/linux/generic/patches-2.6.34/402-ledtrig_netdev.patch
1414 endif # NEW_LEDS
1515--- a/drivers/leds/Makefile
1616+++ b/drivers/leds/Makefile
17@@ -47,3 +47,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) +=
17@@ -47,3 +47,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) +=
1818 obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o
1919 obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
2020 obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o
target/linux/generic/patches-2.6.34/511-yaffs-cvs-2009-04-24.patch
601601             dev->checkpointBlockList[i] = -1;
602602     }
603603
604@@ -191,18 +185,17 @@ int yaffs_GetCheckpointSum(yaffs_Device
604@@ -191,18 +185,17 @@ int yaffs_GetCheckpointSum(yaffs_Device
605605
606606 static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev)
607607 {
...... 
926926 {
927927     unsigned char cDelta; /* column parity delta */
928928     unsigned lDelta; /* line parity delta */
929@@ -294,8 +292,7 @@ int yaffs_ECCCorrectOther(unsigned char
929@@ -294,8 +292,7 @@ int yaffs_ECCCorrectOther(unsigned char
930930         return 0; /* no error */
931931
932932     if (lDelta == ~lDeltaPrime &&
...... 
936936         /* Single bit (recoverable) error in data */
937937
938938         bit = 0;
939@@ -307,7 +304,7 @@ int yaffs_ECCCorrectOther(unsigned char
939@@ -307,7 +304,7 @@ int yaffs_ECCCorrectOther(unsigned char
940940         if (cDelta & 0x02)
941941             bit |= 0x01;
942942
...... 
945945             return -1;
946946
947947         data[lDelta] ^= (1 << bit);
948@@ -316,7 +313,7 @@ int yaffs_ECCCorrectOther(unsigned char
948@@ -316,7 +313,7 @@ int yaffs_ECCCorrectOther(unsigned char
949949     }
950950
951951     if ((yaffs_CountBits32(lDelta) + yaffs_CountBits32(lDeltaPrime) +
...... 
954954         /* Reccoverable error in ecc */
955955
956956         *read_ecc = *test_ecc;
957@@ -326,6 +323,4 @@ int yaffs_ECCCorrectOther(unsigned char
957@@ -326,6 +323,4 @@ int yaffs_ECCCorrectOther(unsigned char
958958     /* Unrecoverable error */
959959
960960     return -1;
...... 
13981398 {
13991399     unsigned char *alias;
14001400     int ret;
1401@@ -329,7 +395,7 @@ static int yaffs_readlink(struct dentry
1401@@ -329,7 +395,7 @@ static int yaffs_readlink(struct dentry
14021402     return ret;
14031403 }
14041404
...... 
15601560 static int yaffs_file_flush(struct file *file, fl_owner_t id)
15611561 #else
15621562 static int yaffs_file_flush(struct file *file)
1563@@ -513,8 +579,8 @@ static int yaffs_file_flush(struct file
1563@@ -513,8 +579,8 @@ static int yaffs_file_flush(struct file
15641564     yaffs_Device *dev = obj->myDev;
15651565
15661566     T(YAFFS_TRACE_OS,
...... 
15711571
15721572     yaffs_GrossLock(dev);
15731573
1574@@ -535,15 +601,15 @@ static int yaffs_readpage_nolock(struct
1574@@ -535,15 +601,15 @@ static int yaffs_readpage_nolock(struct
15751575
15761576     yaffs_Device *dev;
15771577
...... 
15911591     BUG_ON(!PageLocked(pg));
15921592 #else
15931593     if (!PageLocked(pg))
1594@@ -555,9 +621,9 @@ static int yaffs_readpage_nolock(struct
1594@@ -555,9 +621,9 @@ static int yaffs_readpage_nolock(struct
15951595
15961596     yaffs_GrossLock(dev);
15971597
...... 
16041604
16051605     yaffs_GrossUnlock(dev);
16061606
1607@@ -575,7 +641,7 @@ static int yaffs_readpage_nolock(struct
1607@@ -575,7 +641,7 @@ static int yaffs_readpage_nolock(struct
16081608     flush_dcache_page(pg);
16091609     kunmap(pg);
16101610
...... 
31933193         if (n < step) {
31943194             n++;
31953195             continue;
3196@@ -2119,7 +2356,7 @@ static int yaffs_proc_write(struct file
3196@@ -2119,7 +2356,7 @@ static int yaffs_proc_write(struct file
31973197     char *end;
31983198     char *mask_name;
31993199     const char *x;
...... 
32023202     int i;
32033203     int done = 0;
32043204     int add, len = 0;
3205@@ -2129,9 +2366,8 @@ static int yaffs_proc_write(struct file
3205@@ -2129,9 +2366,8 @@ static int yaffs_proc_write(struct file
32063206
32073207     while (!done && (pos < count)) {
32083208         done = 1;
...... 
32133213
32143214         switch (buf[pos]) {
32153215         case '+':
3216@@ -2148,20 +2384,21 @@ static int yaffs_proc_write(struct file
3216@@ -2148,20 +2384,21 @@ static int yaffs_proc_write(struct file
32173217         mask_name = NULL;
32183218
32193219         mask_bitfield = simple_strtoul(buf + pos, &end, 0);
...... 
32403240                     mask_name = mask_flags[i].mask_name;
32413241                     mask_bitfield = mask_flags[i].mask_bitfield;
32423242                     done = 0;
3243@@ -2172,7 +2409,7 @@ static int yaffs_proc_write(struct file
3243@@ -2172,7 +2409,7 @@ static int yaffs_proc_write(struct file
32443244
32453245         if (mask_name != NULL) {
32463246             done = 0;
...... 
32493249             case '-':
32503250                 rg &= ~mask_bitfield;
32513251                 break;
3252@@ -2191,13 +2428,13 @@ static int yaffs_proc_write(struct file
3252@@ -2191,13 +2428,13 @@ static int yaffs_proc_write(struct file
32533253
32543254     yaffs_traceMask = rg | YAFFS_TRACE_ALWAYS;
32553255
...... 
56915691 {
56925692     /* Get the real object in case we were fed a hard link as an equivalent object */
56935693     equivalentObject = yaffs_GetEquivalentObject(equivalentObject);
5694@@ -2363,33 +2396,31 @@ yaffs_Object *yaffs_Link(yaffs_Object *
5694@@ -2363,33 +2396,31 @@ yaffs_Object *yaffs_Link(yaffs_Object *
56955695
56965696 }
56975697
...... 
76227622     int nToCopy;
76237623     int n = nBytes;
76247624     int nDone = 0;
7625@@ -4600,27 +4665,26 @@ int yaffs_ReadDataFromFile(yaffs_Object
7625@@ -4600,27 +4665,26 @@ int yaffs_ReadDataFromFile(yaffs_Object
76267626     dev = in->myDev;
76277627
76287628     while (n > 0) {
...... 
76577657             if (dev->nShortOpCaches > 0) {
76587658
76597659                 /* If we can't find the data in the cache, then load it up. */
7660@@ -4641,14 +4705,9 @@ int yaffs_ReadDataFromFile(yaffs_Object
7660@@ -4641,14 +4705,9 @@ int yaffs_ReadDataFromFile(yaffs_Object
76617661
76627662                 cache->locked = 1;
76637663
...... 
76737673                 cache->locked = 0;
76747674             } else {
76757675                 /* Read into the local buffer then copy..*/
7676@@ -4657,41 +4716,19 @@ int yaffs_ReadDataFromFile(yaffs_Object
7676@@ -4657,41 +4716,19 @@ int yaffs_ReadDataFromFile(yaffs_Object
76777677                     yaffs_GetTempBuffer(dev, __LINE__);
76787678                 yaffs_ReadChunkDataFromObject(in, chunk,
76797679                                   localBuffer);
...... 
77187718         }
77197719
77207720         n -= nToCopy;
7721@@ -4704,28 +4741,37 @@ int yaffs_ReadDataFromFile(yaffs_Object
7721@@ -4704,28 +4741,37 @@ int yaffs_ReadDataFromFile(yaffs_Object
77227722     return nDone;
77237723 }
77247724
...... 
79237923     int newFullChunks;
79247924
79257925     yaffs_Device *dev = in->myDev;
7926@@ -4955,13 +4981,11 @@ int yaffs_ResizeFile(yaffs_Object * in,
7926@@ -4955,13 +4981,11 @@ int yaffs_ResizeFile(yaffs_Object * in,
79277927
79287928     yaffs_CheckGarbageCollection(dev);
79297929
...... 
79417941
79427942     if (newSize < oldFileSize) {
79437943
7944@@ -4994,21 +5018,20 @@ int yaffs_ResizeFile(yaffs_Object * in,
7944@@ -4994,21 +5018,20 @@ int yaffs_ResizeFile(yaffs_Object * in,
79457945     }
79467946
79477947
...... 
79687968 {
79697969     obj = yaffs_GetEquivalentObject(obj);
79707970
7971@@ -5024,7 +5047,7 @@ loff_t yaffs_GetFileSize(yaffs_Object *
7971@@ -5024,7 +5047,7 @@ loff_t yaffs_GetFileSize(yaffs_Object *
79727972
79737973
79747974
...... 
97899789 {
97909790     int init_failed = 0;
97919791     unsigned x;
9792@@ -7040,6 +7126,8 @@ int yaffs_GutsInitialise(yaffs_Device *
9792@@ -7040,6 +7126,8 @@ int yaffs_GutsInitialise(yaffs_Device *
97939793     dev->chunkOffset = 0;
97949794     dev->nFreeChunks = 0;
97959795
...... 
97989798     if (dev->startBlock == 0) {
97999799         dev->internalStartBlock = dev->startBlock + 1;
98009800         dev->internalEndBlock = dev->endBlock + 1;
9801@@ -7049,18 +7137,18 @@ int yaffs_GutsInitialise(yaffs_Device *
9801@@ -7049,18 +7137,18 @@ int yaffs_GutsInitialise(yaffs_Device *
98029802
98039803     /* Check geometry parameters. */
98049804
...... 
98239823         return YAFFS_FAIL;
98249824     }
98259825
9826@@ -7070,6 +7158,12 @@ int yaffs_GutsInitialise(yaffs_Device *
9826@@ -7070,6 +7158,12 @@ int yaffs_GutsInitialise(yaffs_Device *
98279827         return YAFFS_FAIL;
98289828     }
98299829
...... 
98369836     /* Got the right mix of functions? */
98379837     if (!yaffs_CheckDevFunctions(dev)) {
98389838         /* Function missing */
9839@@ -7097,31 +7191,18 @@ int yaffs_GutsInitialise(yaffs_Device *
9839@@ -7097,31 +7191,18 @@ int yaffs_GutsInitialise(yaffs_Device *
98409840
98419841     dev->isMounted = 1;
98429842
...... 
98759875
98769876     /*
98779877      * Calculate chunkGroupBits.
9878@@ -7133,16 +7214,15 @@ int yaffs_GutsInitialise(yaffs_Device *
9878@@ -7133,16 +7214,15 @@ int yaffs_GutsInitialise(yaffs_Device *
98799879     bits = ShiftsGE(x);
98809880
98819881     /* Set up tnode width if wide tnodes are enabled. */
...... 
98969896         dev->tnodeWidth = 16;
98979897
98989898     dev->tnodeMask = (1<<dev->tnodeWidth)-1;
9899@@ -7193,7 +7273,7 @@ int yaffs_GutsInitialise(yaffs_Device *
9899@@ -7193,7 +7273,7 @@ int yaffs_GutsInitialise(yaffs_Device *
99009900     dev->hasPendingPrioritisedGCs = 1; /* Assume the worst for now, will get fixed on first GC */
99019901
99029902     /* Initialise temporary buffers and caches. */
...... 
99059905         init_failed = 1;
99069906
99079907     dev->srCache = NULL;
9908@@ -7203,25 +7283,26 @@ int yaffs_GutsInitialise(yaffs_Device *
9908@@ -7203,25 +7283,26 @@ int yaffs_GutsInitialise(yaffs_Device *
99099909     if (!init_failed &&
99109910         dev->nShortOpCaches > 0) {
99119911         int i;
...... 
99409940             init_failed = 1;
99419941
99429942         dev->srLastUse = 0;
9943@@ -7229,29 +7310,30 @@ int yaffs_GutsInitialise(yaffs_Device *
9943@@ -7229,29 +7310,30 @@ int yaffs_GutsInitialise(yaffs_Device *
99449944
99459945     dev->cacheHits = 0;
99469946
...... 
99799979                 T(YAFFS_TRACE_ALWAYS,
99809980                   (TSTR("yaffs: restored from checkpoint" TENDSTR)));
99819981             } else {
9982@@ -7273,24 +7355,25 @@ int yaffs_GutsInitialise(yaffs_Device *
9982@@ -7273,24 +7355,25 @@ int yaffs_GutsInitialise(yaffs_Device *
99839983                 dev->nBackgroundDeletions = 0;
99849984                 dev->oldestDirtySequence = 0;
99859985
...... 
1001110011         /* Clean up the mess */
1001210012         T(YAFFS_TRACE_TRACING,
1001310013           (TSTR("yaffs: yaffs_GutsInitialise() aborted.\n" TENDSTR)));
10014@@ -7318,7 +7401,7 @@ int yaffs_GutsInitialise(yaffs_Device *
10014@@ -7318,7 +7401,7 @@ int yaffs_GutsInitialise(yaffs_Device *
1001510015
1001610016 }
1001710017
...... 
1071010710 {
1071110711     if (etags) {
1071210712         memset(etags, 0, sizeof(*etags));
10713@@ -169,9 +169,9 @@ static int rettags(yaffs_ExtendedTags *
10713@@ -169,9 +169,9 @@ static int rettags(yaffs_ExtendedTags *
1071410714  * Returns YAFFS_OK or YAFFS_FAIL.
1071510715  */
1071610716 int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev,
...... 
1103811038+ yaffs_UnpackTags2(tags, &pt);
1103911039+ }
1104011040+ }
11041
11042- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
11043- tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
11041+
1104411042+ if (localData)
1104511043+ yaffs_ReleaseTempBuffer(dev, data, __LINE__);
1104611044
11045- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
1104711046+ if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
11048+ tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
11047         tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
11048-
1104911049     if (retval == 0)
1105011050         return YAFFS_OK;
1105111051     else
target/linux/generic/patches-2.6.34/903-hostap_txpower.patch
11--- a/drivers/net/wireless/hostap/hostap_ap.c
22+++ b/drivers/net/wireless/hostap/hostap_ap.c
3@@ -2336,13 +2336,13 @@ int prism2_ap_get_sta_qual(local_info_t
3@@ -2336,13 +2336,13 @@ int prism2_ap_get_sta_qual(local_info_t
44         addr[count].sa_family = ARPHRD_ETHER;
55         memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
66         if (sta->last_rx_silence == 0)
target/linux/generic/patches-2.6.34/924-cs5535_gpio.patch
88 #include <linux/ioport.h>
99 #include <linux/pci.h>
1010
11@@ -48,6 +49,7 @@ static struct pci_device_id divil_pci[]
11@@ -48,6 +49,7 @@ static struct pci_device_id divil_pci[]
1212 MODULE_DEVICE_TABLE(pci, divil_pci);
1313
1414 static struct cdev cs5535_gpio_cdev;
target/linux/generic/patches-2.6.34/971-ocf_20100325.patch
2424  * All of these routines try to estimate how many bits of randomness a
2525  * particular randomness source. They do this by keeping track of the
2626  * first and second order deltas of the event timings.
27@@ -714,6 +724,61 @@ void add_disk_randomness(struct gendisk
27@@ -714,6 +724,61 @@ void add_disk_randomness(struct gendisk
2828 }
2929 #endif
3030
target/linux/generic/patches-2.6.34/975-ssb_update.patch
385385     u32 pmucap;
386386
387387     if (!(cc->capabilities & SSB_CHIPCO_CAP_PMU))
388@@ -516,15 +516,12 @@ void ssb_pmu_init(struct ssb_chipcommon
388@@ -516,15 +516,12 @@ void ssb_pmu_init(struct ssb_chipcommon
389389     ssb_dprintk(KERN_DEBUG PFX "Found rev %u PMU (capabilities 0x%08X)\n",
390390             cc->pmu.rev, pmucap);
391391
...... 
527527 /* Helper to extract some _offset, which is one of the SSB_SPROM_XXX defines. */
528528 #define SPEX16(_outvar, _offset, _mask, _shift) \
529529     out->_outvar = ((in[SPOFF(_offset)] & (_mask)) >> (_shift))
530@@ -623,6 +623,28 @@ static int ssb_pci_sprom_get(struct ssb_
531
532     if (!ssb_is_sprom_available(bus)) {
533         ssb_printk(KERN_ERR PFX "No SPROM available!\n");
534+ return -ENODEV;
535+ }
536+ if (bus->chipco.dev) { /* can be unavailible! */
537+ /*
538+ * get SPROM offset: SSB_SPROM_BASE1 except for
539+ * chipcommon rev >= 31 or chip ID is 0x4312 and
540+ * chipcommon status & 3 == 2
541+ */
542+ if (bus->chipco.dev->id.revision >= 31)
543+ bus->sprom_offset = SSB_SPROM_BASE31;
544+ else if (bus->chip_id == 0x4312 &&
545+ (bus->chipco.status & 0x03) == 2)
546+ bus->sprom_offset = SSB_SPROM_BASE31;
547+ else
548+ bus->sprom_offset = SSB_SPROM_BASE1;
549+ } else {
550+ bus->sprom_offset = SSB_SPROM_BASE1;
551+ }
552+ ssb_dprintk(KERN_INFO PFX "SPROM offset is 0x%x\n", bus->sprom_offset);
553+
554+ if (!ssb_is_sprom_available(bus)) {
555+ ssb_printk(KERN_ERR PFX "No SPROM available!\n");
556         return -ENODEV;
557     }
558     if (bus->chipco.dev) { /* can be unavailible! */
530559--- a/include/linux/ssb/ssb.h
531560+++ b/include/linux/ssb/ssb.h
532561@@ -167,7 +167,7 @@ struct ssb_device {
...... 
538567
539568     struct ssb_bus *bus;
540569     struct ssb_device_id id;
541@@ -470,14 +470,6 @@ extern u32 ssb_dma_translation(struct ss
570@@ -398,6 +398,9 @@ extern void ssb_bus_unregister(struct ss
571 /* Does the device have an SPROM? */
572 extern bool ssb_is_sprom_available(struct ssb_bus *bus);
573
574+/* Does the device have an SPROM? */
575+extern bool ssb_is_sprom_available(struct ssb_bus *bus);
576+
577 /* Set a fallback SPROM.
578  * See kdoc at the function definition for complete documentation. */
579 extern int ssb_arch_set_fallback_sprom(const struct ssb_sprom *sprom);
580@@ -470,14 +473,6 @@ extern u32 ssb_dma_translation(struct ss
542581 #define SSB_DMA_TRANSLATION_MASK 0xC0000000
543582 #define SSB_DMA_TRANSLATION_SHIFT 30
544583
...... 
553592 static inline void __cold __ssb_dma_not_implemented(struct ssb_device *dev)
554593 {
555594 #ifdef CONFIG_SSB_DEBUG
556@@ -486,155 +478,6 @@ static inline void __cold __ssb_dma_not_
595@@ -486,155 +481,6 @@ static inline void __cold __ssb_dma_not_
557596 #endif /* DEBUG */
558597 }
559598
target/linux/generic/patches-2.6.34/977-ssb_export_fallback_sprom.patch
1010 bool ssb_is_sprom_available(struct ssb_bus *bus)
1111--- a/include/linux/ssb/ssb.h
1212+++ b/include/linux/ssb/ssb.h
13@@ -401,6 +401,7 @@ extern bool ssb_is_sprom_available(struc
13@@ -404,6 +404,7 @@ extern bool ssb_is_sprom_available(struc
1414 /* Set a fallback SPROM.
1515  * See kdoc at the function definition for complete documentation. */
1616 extern int ssb_arch_set_fallback_sprom(const struct ssb_sprom *sprom);
target/linux/generic/patches-2.6.34/998-openwrt_lzma_options.patch
11--- a/scripts/Makefile.lib
22+++ b/scripts/Makefile.lib
3@@ -238,7 +238,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)
3@@ -238,7 +238,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)
44
55 quiet_cmd_lzma = LZMA $@
66 cmd_lzma = (cat $(filter-out FORCE,$^) | \

Archive Download the corresponding diff file



interactive