refresh 2.6.37 patches

SVN-Revision: 26955
owl
Florian Fainelli 2011-05-20 10:06:11 +00:00
parent f0a99c1692
commit f9f8dcfa70
26 changed files with 72 additions and 72 deletions

View File

@ -1,6 +1,6 @@
--- a/include/net/inet_ecn.h
+++ b/include/net/inet_ecn.h
@@ -38,9 +38,19 @@ static inline __u8 INET_ECN_encapsulate(__u8 outer, __u8 inner)
@@ -38,9 +38,19 @@ static inline __u8 INET_ECN_encapsulate(
return outer;
}

View File

@ -193,7 +193,7 @@
/*
* This function, given a master MTD object and a partition table, creates
* and registers slave MTD objects which are bound to the master according to
@@ -633,7 +782,7 @@ int add_mtd_partitions(struct mtd_info *
@@ -633,7 +784,7 @@ int add_mtd_partitions(struct mtd_info *
{
struct mtd_part *slave;
uint64_t cur_offset = 0;
@ -202,7 +202,7 @@
printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
@@ -648,6 +797,21 @@ int add_mtd_partitions(struct mtd_info *
@@ -648,6 +799,21 @@ int add_mtd_partitions(struct mtd_info *
add_mtd_device(&slave->mtd);
@ -224,7 +224,7 @@
cur_offset = slave->offset + slave->mtd.size;
}
@@ -655,6 +819,32 @@ int add_mtd_partitions(struct mtd_info *
@@ -655,6 +821,32 @@ int add_mtd_partitions(struct mtd_info *
}
EXPORT_SYMBOL(add_mtd_partitions);

View File

@ -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

View File

@ -1,8 +1,8 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -103,6 +103,9 @@ config ADM6996_PHY
---help---
Currently supports the ADM6996F switch
@@ -105,6 +105,9 @@ config ADM6996_PHY
Currently supports the ADM6996FC and ADM6996M switches.
Support for FC is very limited.
+config MVSWITCH_PHY
+ tristate "Driver for Marvell 88E6060 switches"

View File

@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -106,6 +106,10 @@ config ADM6996_PHY
@@ -108,6 +108,10 @@ config ADM6996_PHY
config MVSWITCH_PHY
tristate "Driver for Marvell 88E6060 switches"

View File

@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -110,6 +110,10 @@ config IP17XX_PHY
@@ -112,6 +112,10 @@ config IP17XX_PHY
tristate "Driver for IC+ IP17xx switches"
select SWCONFIG

View File

@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -114,6 +114,10 @@ config AR8216_PHY
@@ -116,6 +116,10 @@ config AR8216_PHY
tristate "Driver for Atheros AR8216 switches"
select SWCONFIG

View File

@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -156,4 +156,29 @@ config MDIO_OCTEON
@@ -158,4 +158,29 @@ config MDIO_OCTEON
If in doubt, say Y.