qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-08-19 16:04:36 +03:00
Code

generic-2.6: refresh patches

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21542 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
hauke 2010-05-23 13:17:32 +00:00
parent 2f05a5f0ef
commit f7999a72e6
11 changed files with 39 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
target/linux/generic-2.6/patches-2.6.32/110-netfilter_match_speedup.patch
View File

@ -127,11 +127,10 @@
e = (struct ipt_entry *)(loc_cpu_entry + off); e = (struct ipt_entry *)(loc_cpu_entry + off);
if (copy_to_user(userptr + off if (copy_to_user(userptr + off
@@ -1001,6 +1041,14 @@ copy_entries_to_user(unsigned int total_ @@ -1002,6 +1042,14 @@ copy_entries_to_user(unsigned int total_
ret = -EFAULT;
goto free_counters; goto free_counters;
} }
+
+ flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH; + flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
+ if (copy_to_user(userptr + off + if (copy_to_user(userptr + off
+ + offsetof(struct ipt_entry, ip.flags), + + offsetof(struct ipt_entry, ip.flags),
@ -139,6 +138,7 @@
+ ret = -EFAULT; + ret = -EFAULT;
+ goto free_counters; + goto free_counters;
+ } + }
+
for (i = sizeof(struct ipt_entry); for (i = sizeof(struct ipt_entry);
i < e->target_offset; i < e->target_offset;
i += m->u.match_size) {

8
target/linux/generic-2.6/patches-2.6.32/511-yaffs-cvs-2009-04-24.patch
View File

@ -11038,14 +11038,14 @@
+ yaffs_UnpackTags2(tags, &pt); + yaffs_UnpackTags2(tags, &pt);
+ } + }
+ } + }
+
- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
- tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
+ if (localData) + if (localData)
+ yaffs_ReleaseTempBuffer(dev, data, __LINE__); + 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) + 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) if (retval == 0)
return YAFFS_OK; return YAFFS_OK;
else else

12
target/linux/generic-2.6/patches-2.6.32/975-ssb_update.patch
View File

@ -350,7 +350,7 @@
/* Helper to extract some _offset, which is one of the SSB_SPROM_XXX defines. */ /* Helper to extract some _offset, which is one of the SSB_SPROM_XXX defines. */
#define SPEX16(_outvar, _offset, _mask, _shift) \ #define SPEX16(_outvar, _offset, _mask, _shift) \
out->_outvar = ((in[SPOFF(_offset)] & (_mask)) >> (_shift)) out->_outvar = ((in[SPOFF(_offset)] & (_mask)) >> (_shift))
@@ -253,7 +254,7 @@ static int sprom_do_read(struct ssb_bus @@ -253,7 +254,7 @@ static int sprom_do_read(struct ssb_bus
int i; int i;
for (i = 0; i < bus->sprom_size; i++) for (i = 0; i < bus->sprom_size; i++)
@ -404,10 +404,7 @@
+static int ssb_pcmcia_get_mac(struct pcmcia_device *p_dev, +static int ssb_pcmcia_get_mac(struct pcmcia_device *p_dev,
+ tuple_t *tuple, + tuple_t *tuple,
+ void *priv) + void *priv)
{ +{
- tuple_t tuple;
- int res;
- unsigned char buf[32];
+ struct ssb_sprom *sprom = priv; + struct ssb_sprom *sprom = priv;
+ +
+ if (tuple->TupleData[0] != CISTPL_FUNCE_LAN_NODE_ID) + if (tuple->TupleData[0] != CISTPL_FUNCE_LAN_NODE_ID)
@ -423,7 +420,10 @@
+static int ssb_pcmcia_do_get_invariants(struct pcmcia_device *p_dev, +static int ssb_pcmcia_do_get_invariants(struct pcmcia_device *p_dev,
+ tuple_t *tuple, + tuple_t *tuple,
+ void *priv) + void *priv)
+{ {
- tuple_t tuple;
- int res;
- unsigned char buf[32];
+ struct ssb_init_invariants *iv = priv; + struct ssb_init_invariants *iv = priv;
struct ssb_sprom *sprom = &iv->sprom; struct ssb_sprom *sprom = &iv->sprom;
struct ssb_boardinfo *bi = &iv->boardinfo; struct ssb_boardinfo *bi = &iv->boardinfo;

8
target/linux/generic-2.6/patches-2.6.33/088-winbond_cmdset.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.32.12/drivers/mtd/chips/gen_probe.c --- a/drivers/mtd/chips/gen_probe.c
=================================================================== +++ b/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 @@ -249,6 +249,7 @@ static struct mtd_info *check_cmd_set(st
+++ linux-2.6.32.12/drivers/mtd/chips/gen_probe.c 2010-05-03 10:48:16.000000000 +0200
@@ -249,6 +249,7 @@
#endif #endif
#ifdef CONFIG_MTD_CFI_AMDSTD #ifdef CONFIG_MTD_CFI_AMDSTD
case 0x0002: case 0x0002:

8
target/linux/generic-2.6/patches-2.6.33/110-netfilter_match_speedup.patch
View File

@ -127,11 +127,10 @@
e = (struct ipt_entry *)(loc_cpu_entry + off); e = (struct ipt_entry *)(loc_cpu_entry + off);
if (copy_to_user(userptr + off if (copy_to_user(userptr + off
@@ -1001,6 +1041,14 @@ copy_entries_to_user(unsigned int total_ @@ -1002,6 +1042,14 @@ copy_entries_to_user(unsigned int total_
ret = -EFAULT;
goto free_counters; goto free_counters;
} }
+
+ flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH; + flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
+ if (copy_to_user(userptr + off + if (copy_to_user(userptr + off
+ + offsetof(struct ipt_entry, ip.flags), + + offsetof(struct ipt_entry, ip.flags),
@ -139,6 +138,7 @@
+ ret = -EFAULT; + ret = -EFAULT;
+ goto free_counters; + goto free_counters;
+ } + }
+
for (i = sizeof(struct ipt_entry); for (i = sizeof(struct ipt_entry);
i < e->target_offset; i < e->target_offset;
i += m->u.match_size) {

8
target/linux/generic-2.6/patches-2.6.33/511-yaffs-cvs-2009-04-24.patch
View File

@ -11038,14 +11038,14 @@
+ yaffs_UnpackTags2(tags, &pt); + yaffs_UnpackTags2(tags, &pt);
+ } + }
+ } + }
+
- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
- tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
+ if (localData) + if (localData)
+ yaffs_ReleaseTempBuffer(dev, data, __LINE__); + 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) + 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) if (retval == 0)
return YAFFS_OK; return YAFFS_OK;
else else

4
target/linux/generic-2.6/patches-2.6.34/020-mips_multi_machine_support.patch
View File

@ -137,7 +137,7 @@
--- a/arch/mips/Kconfig --- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig +++ b/arch/mips/Kconfig
@@ -851,6 +851,9 @@ config MIPS_DISABLE_OBSOLETE_IDE @@ -853,6 +853,9 @@ config MIPS_DISABLE_OBSOLETE_IDE
config SYNC_R4K config SYNC_R4K
bool bool
@ -157,7 +157,7 @@
unsigned int vced_count, vcei_count; 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 * For the first processor also print the system type
*/ */

8
target/linux/generic-2.6/patches-2.6.34/088-winbond_cmdset.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.32.12/drivers/mtd/chips/gen_probe.c --- a/drivers/mtd/chips/gen_probe.c
=================================================================== +++ b/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 @@ -249,6 +249,7 @@ static struct mtd_info *check_cmd_set(st
+++ linux-2.6.32.12/drivers/mtd/chips/gen_probe.c 2010-05-03 10:48:16.000000000 +0200
@@ -249,6 +249,7 @@
#endif #endif
#ifdef CONFIG_MTD_CFI_AMDSTD #ifdef CONFIG_MTD_CFI_AMDSTD
case 0x0002: case 0x0002:

8
target/linux/generic-2.6/patches-2.6.34/110-netfilter_match_speedup.patch
View File

@ -127,11 +127,10 @@
e = (struct ipt_entry *)(loc_cpu_entry + off); e = (struct ipt_entry *)(loc_cpu_entry + off);
if (copy_to_user(userptr + off if (copy_to_user(userptr + off
@@ -1000,6 +1040,14 @@ copy_entries_to_user(unsigned int total_ @@ -1001,6 +1041,14 @@ copy_entries_to_user(unsigned int total_
ret = -EFAULT;
goto free_counters; goto free_counters;
} }
+
+ flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH; + flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
+ if (copy_to_user(userptr + off + if (copy_to_user(userptr + off
+ + offsetof(struct ipt_entry, ip.flags), + + offsetof(struct ipt_entry, ip.flags),
@ -139,6 +138,7 @@
+ ret = -EFAULT; + ret = -EFAULT;
+ goto free_counters; + goto free_counters;
+ } + }
+
for (i = sizeof(struct ipt_entry); for (i = sizeof(struct ipt_entry);
i < e->target_offset; i < e->target_offset;
i += m->u.match_size) {

8
target/linux/generic-2.6/patches-2.6.34/511-yaffs-cvs-2009-04-24.patch
View File

@ -11038,14 +11038,14 @@
+ yaffs_UnpackTags2(tags, &pt); + yaffs_UnpackTags2(tags, &pt);
+ } + }
+ } + }
+
- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
- tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
+ if (localData) + if (localData)
+ yaffs_ReleaseTempBuffer(dev, data, __LINE__); + 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) + 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) if (retval == 0)
return YAFFS_OK; return YAFFS_OK;
else else

2
target/linux/generic-2.6/patches-2.6.34/980-vm_exports.patch
View File

@ -76,7 +76,7 @@
* macro override instead of weak attribute alias, to workaround * macro override instead of weak attribute alias, to workaround
--- a/kernel/sched.c --- a/kernel/sched.c
+++ b/kernel/sched.c +++ b/kernel/sched.c
@@ -4357,6 +4357,7 @@ int can_nice(const struct task_struct *p @@ -4367,6 +4367,7 @@ int can_nice(const struct task_struct *p
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) || return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
capable(CAP_SYS_NICE)); capable(CAP_SYS_NICE));
} }