183130227/tn3399_openwrt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kernel: refresh patches

Browse Source 
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 38291
This commit is contained in:
Hauke Mehrtens 2013-10-02 22:26:43 +00:00
parent fa839274b0
commit 101034fa23
11 changed files with 25 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
target/linux/generic/patches-3.3/007-hso-Earlier-catch-of-error-condition.patch
View File

@ -13,11 +13,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/hso.c | 9 +++++---- drivers/net/usb/hso.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-) 1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index cba1d46..5fb36ed 100644
--- a/drivers/net/usb/hso.c --- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c +++ b/drivers/net/usb/hso.c
@@ -2886,6 +2886,11 @@ static int hso_probe(struct usb_interface *interface, @@ -2927,6 +2927,11 @@ static int hso_probe(struct usb_interfac
struct hso_shared_int *shared_int; struct hso_shared_int *shared_int;
struct hso_device *tmp_dev = NULL; struct hso_device *tmp_dev = NULL;
@ -29,7 +27,7 @@ index cba1d46..5fb36ed 100644
if_num = interface->altsetting->desc.bInterfaceNumber; if_num = interface->altsetting->desc.bInterfaceNumber;
/* Get the interface/port specification from either driver_info or from /* Get the interface/port specification from either driver_info or from
@@ -2895,10 +2900,6 @@ static int hso_probe(struct usb_interface *interface, @@ -2936,10 +2941,6 @@ static int hso_probe(struct usb_interfac
else else
port_spec = hso_get_config_data(interface); port_spec = hso_get_config_data(interface);
@ -40,6 +38,3 @@ index cba1d46..5fb36ed 100644
/* Check if we need to switch to alt interfaces prior to port /* Check if we need to switch to alt interfaces prior to port
* configuration */ * configuration */
if (interface->num_altsetting > 1) if (interface->num_altsetting > 1)
--
1.7.9.5

9
target/linux/generic/patches-3.3/008-hso-Fix-stack-corruption-on-some-architectures.patch
View File

@ -18,11 +18,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/hso.c | 6 +++++- drivers/net/usb/hso.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-) 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index 5fb36ed..86292e6 100644
--- a/drivers/net/usb/hso.c --- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c +++ b/drivers/net/usb/hso.c
@@ -2816,13 +2816,16 @@ exit: @@ -2857,13 +2857,16 @@ exit:
static int hso_get_config_data(struct usb_interface *interface) static int hso_get_config_data(struct usb_interface *interface)
{ {
struct usb_device *usbdev = interface_to_usbdev(interface); struct usb_device *usbdev = interface_to_usbdev(interface);
@ -40,7 +38,7 @@ index 5fb36ed..86292e6 100644
return -EIO; return -EIO;
} }
@@ -2873,6 +2876,7 @@ static int hso_get_config_data(struct usb_interface *interface) @@ -2914,6 +2917,7 @@ static int hso_get_config_data(struct us
if (config_data[16] & 0x1) if (config_data[16] & 0x1)
result |= HSO_INFO_CRC_BUG; result |= HSO_INFO_CRC_BUG;
@ -48,6 +46,3 @@ index 5fb36ed..86292e6 100644
return result; return result;
} }
--
1.7.9.5

9
target/linux/generic/patches-3.6/007-hso-Earlier-catch-of-error-condition.patch
View File

@ -13,11 +13,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/hso.c | 9 +++++---- drivers/net/usb/hso.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-) 1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index cba1d46..5fb36ed 100644
--- a/drivers/net/usb/hso.c --- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c +++ b/drivers/net/usb/hso.c
@@ -2886,6 +2886,11 @@ static int hso_probe(struct usb_interface *interface, @@ -2908,6 +2908,11 @@ static int hso_probe(struct usb_interfac
struct hso_shared_int *shared_int; struct hso_shared_int *shared_int;
struct hso_device *tmp_dev = NULL; struct hso_device *tmp_dev = NULL;
@ -29,7 +27,7 @@ index cba1d46..5fb36ed 100644
if_num = interface->altsetting->desc.bInterfaceNumber; if_num = interface->altsetting->desc.bInterfaceNumber;
/* Get the interface/port specification from either driver_info or from /* Get the interface/port specification from either driver_info or from
@@ -2895,10 +2900,6 @@ static int hso_probe(struct usb_interface *interface, @@ -2917,10 +2922,6 @@ static int hso_probe(struct usb_interfac
else else
port_spec = hso_get_config_data(interface); port_spec = hso_get_config_data(interface);
@ -40,6 +38,3 @@ index cba1d46..5fb36ed 100644
/* Check if we need to switch to alt interfaces prior to port /* Check if we need to switch to alt interfaces prior to port
* configuration */ * configuration */
if (interface->num_altsetting > 1) if (interface->num_altsetting > 1)
--
1.7.9.5

9
target/linux/generic/patches-3.6/008-hso-Fix-stack-corruption-on-some-architectures.patch
View File

@ -18,11 +18,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/hso.c | 6 +++++- drivers/net/usb/hso.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-) 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index 5fb36ed..86292e6 100644
--- a/drivers/net/usb/hso.c --- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c +++ b/drivers/net/usb/hso.c
@@ -2816,13 +2816,16 @@ exit: @@ -2838,13 +2838,16 @@ exit:
static int hso_get_config_data(struct usb_interface *interface) static int hso_get_config_data(struct usb_interface *interface)
{ {
struct usb_device *usbdev = interface_to_usbdev(interface); struct usb_device *usbdev = interface_to_usbdev(interface);
@ -40,7 +38,7 @@ index 5fb36ed..86292e6 100644
return -EIO; return -EIO;
} }
@@ -2873,6 +2876,7 @@ static int hso_get_config_data(struct usb_interface *interface) @@ -2895,6 +2898,7 @@ static int hso_get_config_data(struct us
if (config_data[16] & 0x1) if (config_data[16] & 0x1)
result |= HSO_INFO_CRC_BUG; result |= HSO_INFO_CRC_BUG;
@ -48,6 +46,3 @@ index 5fb36ed..86292e6 100644
return result; return result;
} }
--
1.7.9.5

6
target/linux/generic/patches-3.6/441-block2mtd_refresh.patch
View File

@ -231,8 +231,7 @@
- bdev = blkdev_get_by_path(devname, mode, dev); - bdev = blkdev_get_by_path(devname, mode, dev);
-#ifndef MODULE -#ifndef MODULE
- if (IS_ERR(bdev)) { - if (IS_ERR(bdev)) {
+ strcpy(dev->devname, devname); -
- /* We might not have rootfs mounted at this point. Try - /* We might not have rootfs mounted at this point. Try
- to resolve the device name by other means. */ - to resolve the device name by other means. */
- -
@ -247,7 +246,8 @@
- goto devinit_err; - goto devinit_err;
- } - }
- dev->blkdev = bdev; - dev->blkdev = bdev;
- + strcpy(dev->devname, devname);
- if (MAJOR(bdev->bd_dev) == MTD_BLOCK_MAJOR) { - if (MAJOR(bdev->bd_dev) == MTD_BLOCK_MAJOR) {
- ERROR("attempting to use an MTD device as a block device"); - ERROR("attempting to use an MTD device as a block device");
+ if (_open_bdev(dev)) + if (_open_bdev(dev))

9
target/linux/generic/patches-3.8/007-hso-Earlier-catch-of-error-condition.patch
View File

@ -13,11 +13,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/hso.c | 9 +++++---- drivers/net/usb/hso.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-) 1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index cba1d46..5fb36ed 100644
--- a/drivers/net/usb/hso.c --- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c +++ b/drivers/net/usb/hso.c
@@ -2886,6 +2886,11 @@ static int hso_probe(struct usb_interface *interface, @@ -2908,6 +2908,11 @@ static int hso_probe(struct usb_interfac
struct hso_shared_int *shared_int; struct hso_shared_int *shared_int;
struct hso_device *tmp_dev = NULL; struct hso_device *tmp_dev = NULL;
@ -29,7 +27,7 @@ index cba1d46..5fb36ed 100644
if_num = interface->altsetting->desc.bInterfaceNumber; if_num = interface->altsetting->desc.bInterfaceNumber;
/* Get the interface/port specification from either driver_info or from /* Get the interface/port specification from either driver_info or from
@@ -2895,10 +2900,6 @@ static int hso_probe(struct usb_interface *interface, @@ -2917,10 +2922,6 @@ static int hso_probe(struct usb_interfac
else else
port_spec = hso_get_config_data(interface); port_spec = hso_get_config_data(interface);
@ -40,6 +38,3 @@ index cba1d46..5fb36ed 100644
/* Check if we need to switch to alt interfaces prior to port /* Check if we need to switch to alt interfaces prior to port
* configuration */ * configuration */
if (interface->num_altsetting > 1) if (interface->num_altsetting > 1)
--
1.7.9.5

9
target/linux/generic/patches-3.8/008-hso-Fix-stack-corruption-on-some-architectures.patch
View File

@ -18,11 +18,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/hso.c | 6 +++++- drivers/net/usb/hso.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-) 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index 5fb36ed..86292e6 100644
--- a/drivers/net/usb/hso.c --- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c +++ b/drivers/net/usb/hso.c
@@ -2816,13 +2816,16 @@ exit: @@ -2838,13 +2838,16 @@ exit:
static int hso_get_config_data(struct usb_interface *interface) static int hso_get_config_data(struct usb_interface *interface)
{ {
struct usb_device *usbdev = interface_to_usbdev(interface); struct usb_device *usbdev = interface_to_usbdev(interface);
@ -40,7 +38,7 @@ index 5fb36ed..86292e6 100644
return -EIO; return -EIO;
} }
@@ -2873,6 +2876,7 @@ static int hso_get_config_data(struct usb_interface *interface) @@ -2895,6 +2898,7 @@ static int hso_get_config_data(struct us
if (config_data[16] & 0x1) if (config_data[16] & 0x1)
result |= HSO_INFO_CRC_BUG; result |= HSO_INFO_CRC_BUG;
@ -48,6 +46,3 @@ index 5fb36ed..86292e6 100644
return result; return result;
} }
--
1.7.9.5

6
target/linux/generic/patches-3.8/441-block2mtd_refresh.patch
View File

@ -231,8 +231,7 @@
- bdev = blkdev_get_by_path(devname, mode, dev); - bdev = blkdev_get_by_path(devname, mode, dev);
-#ifndef MODULE -#ifndef MODULE
- if (IS_ERR(bdev)) { - if (IS_ERR(bdev)) {
+ strcpy(dev->devname, devname); -
- /* We might not have rootfs mounted at this point. Try - /* We might not have rootfs mounted at this point. Try
- to resolve the device name by other means. */ - to resolve the device name by other means. */
- -
@ -247,7 +246,8 @@
- goto devinit_err; - goto devinit_err;
- } - }
- dev->blkdev = bdev; - dev->blkdev = bdev;
- + strcpy(dev->devname, devname);
- if (MAJOR(bdev->bd_dev) == MTD_BLOCK_MAJOR) { - if (MAJOR(bdev->bd_dev) == MTD_BLOCK_MAJOR) {
- ERROR("attempting to use an MTD device as a block device"); - ERROR("attempting to use an MTD device as a block device");
+ if (_open_bdev(dev)) + if (_open_bdev(dev))

9
target/linux/generic/patches-3.9/007-hso-Earlier-catch-of-error-condition.patch
View File

@ -13,11 +13,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/hso.c | 9 +++++---- drivers/net/usb/hso.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-) 1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index cba1d46..5fb36ed 100644
--- a/drivers/net/usb/hso.c --- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c +++ b/drivers/net/usb/hso.c
@@ -2886,6 +2886,11 @@ static int hso_probe(struct usb_interface *interface, @@ -2895,6 +2895,11 @@ static int hso_probe(struct usb_interfac
struct hso_shared_int *shared_int; struct hso_shared_int *shared_int;
struct hso_device *tmp_dev = NULL; struct hso_device *tmp_dev = NULL;
@ -29,7 +27,7 @@ index cba1d46..5fb36ed 100644
if_num = interface->altsetting->desc.bInterfaceNumber; if_num = interface->altsetting->desc.bInterfaceNumber;
/* Get the interface/port specification from either driver_info or from /* Get the interface/port specification from either driver_info or from
@@ -2895,10 +2900,6 @@ static int hso_probe(struct usb_interface *interface, @@ -2904,10 +2909,6 @@ static int hso_probe(struct usb_interfac
else else
port_spec = hso_get_config_data(interface); port_spec = hso_get_config_data(interface);
@ -40,6 +38,3 @@ index cba1d46..5fb36ed 100644
/* Check if we need to switch to alt interfaces prior to port /* Check if we need to switch to alt interfaces prior to port
* configuration */ * configuration */
if (interface->num_altsetting > 1) if (interface->num_altsetting > 1)
--
1.7.9.5

9
target/linux/generic/patches-3.9/008-hso-Fix-stack-corruption-on-some-architectures.patch
View File

@ -18,11 +18,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/hso.c | 6 +++++- drivers/net/usb/hso.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-) 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index 5fb36ed..86292e6 100644
--- a/drivers/net/usb/hso.c --- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c +++ b/drivers/net/usb/hso.c
@@ -2816,13 +2816,16 @@ exit: @@ -2825,13 +2825,16 @@ exit:
static int hso_get_config_data(struct usb_interface *interface) static int hso_get_config_data(struct usb_interface *interface)
{ {
struct usb_device *usbdev = interface_to_usbdev(interface); struct usb_device *usbdev = interface_to_usbdev(interface);
@ -40,7 +38,7 @@ index 5fb36ed..86292e6 100644
return -EIO; return -EIO;
} }
@@ -2873,6 +2876,7 @@ static int hso_get_config_data(struct usb_interface *interface) @@ -2882,6 +2885,7 @@ static int hso_get_config_data(struct us
if (config_data[16] & 0x1) if (config_data[16] & 0x1)
result |= HSO_INFO_CRC_BUG; result |= HSO_INFO_CRC_BUG;
@ -48,6 +46,3 @@ index 5fb36ed..86292e6 100644
return result; return result;
} }
--
1.7.9.5

6
target/linux/generic/patches-3.9/441-block2mtd_refresh.patch
View File

@ -231,8 +231,7 @@
- bdev = blkdev_get_by_path(devname, mode, dev); - bdev = blkdev_get_by_path(devname, mode, dev);
-#ifndef MODULE -#ifndef MODULE
- if (IS_ERR(bdev)) { - if (IS_ERR(bdev)) {
+ strcpy(dev->devname, devname); -
- /* We might not have rootfs mounted at this point. Try - /* We might not have rootfs mounted at this point. Try
- to resolve the device name by other means. */ - to resolve the device name by other means. */
- -
@ -247,7 +246,8 @@
- goto devinit_err; - goto devinit_err;
- } - }
- dev->blkdev = bdev; - dev->blkdev = bdev;
- + strcpy(dev->devname, devname);
- if (MAJOR(bdev->bd_dev) == MTD_BLOCK_MAJOR) { - if (MAJOR(bdev->bd_dev) == MTD_BLOCK_MAJOR) {
- ERROR("attempting to use an MTD device as a block device"); - ERROR("attempting to use an MTD device as a block device");
+ if (_open_bdev(dev)) + if (_open_bdev(dev))