[kernel] r17395 - in dists/trunk/linux-2.6/debian: . patches/features/all patches/series
Ben Hutchings
benh at alioth.debian.org
Fri May 13 04:51:42 UTC 2011
Author: benh
Date: Fri May 13 04:51:41 2011
New Revision: 17395
Log:
rt2800usb: Enable support for more USB devices including Linksys WUSB600N (Closes: #596626)
Added:
dists/trunk/linux-2.6/debian/patches/features/all/rt2800usb-Add-seven-new-USB-IDs.patch
dists/trunk/linux-2.6/debian/patches/features/all/rt2x00-Add-support-for-the-ZyXEL-NWD-211AN-USB.patch
dists/trunk/linux-2.6/debian/patches/features/all/rt2x00-Linksys-WUSB600N-rev2-is-a-RT3572-device.patch
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/patches/series/1~experimental.2
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog Fri May 13 04:38:34 2011 (r17394)
+++ dists/trunk/linux-2.6/debian/changelog Fri May 13 04:51:41 2011 (r17395)
@@ -11,6 +11,8 @@
[ Ben Hutchings ]
* [!x86] Disable TPM drivers. TPMs are currently only fitted in PCs.
+ * rt2800usb: Enable support for more USB devices including
+ Linksys WUSB600N (Closes: #596626)
-- maximilian attems <maks at debian.org> Tue, 10 May 2011 23:24:26 +0200
Added: dists/trunk/linux-2.6/debian/patches/features/all/rt2800usb-Add-seven-new-USB-IDs.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/rt2800usb-Add-seven-new-USB-IDs.patch Fri May 13 04:51:41 2011 (r17395)
@@ -0,0 +1,132 @@
+From: Mark Davis <marked86 at gmail.com>
+Date: Tue, 12 Apr 2011 00:19:10 -0400
+Subject: [PATCH] rt2800usb: Add seven new USB IDs
+
+commit b3ba44c6d1633692b45910ee77064e635e2c3143 upstream.
+
+Adds USB IDs for seven previously missing devices. Additionally, all
+instances of 'Conceptronic' have been replaced by the OEM name.
+
+Devices added are..
+0411:01a2 - Buffalo WLI-UC-GNM, RT3070V
+0586:341e - ZyXEL NWD2105, RT3070
+13b1:002f - Linksys AE1000, RT3572
+13b1:0031 - Cisco / Linksys AM10, RT3072
+14b2:3c2c - Keebox W150NU / Alpha Networks WUS-N12, RT3070
+157e:3013 - TRENDnet TEW-645UB, RT2770+RT2720
+15a9:0012 - Airlink AWLL7025 / Gemtek WUBR-208N, RT2870+RT2850
+
+Signed-off-by: Mark Davis <marked86 at gmail.com>
+Acked-by: Gertjan van Wingerde <gwingerde at gmail.com>
+Acked-by: Ivo van Doorn <IvDoorn at gmail.com>
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
+---
+ drivers/net/wireless/rt2x00/rt2800usb.c | 35 +++++++++++++++++++-----------
+ 1 files changed, 22 insertions(+), 13 deletions(-)
+
+diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
+index 6ba31a0..d2f5c87 100644
+--- a/drivers/net/wireless/rt2x00/rt2800usb.c
++++ b/drivers/net/wireless/rt2x00/rt2800usb.c
+@@ -710,6 +710,16 @@ static struct usb_device_id rt2800usb_device_table[] = {
+ { USB_DEVICE(0x8516, 0x3070), USB_DEVICE_DATA(&rt2800usb_ops) },
+ { USB_DEVICE(0x8516, 0x3071), USB_DEVICE_DATA(&rt2800usb_ops) },
+ { USB_DEVICE(0x8516, 0x3072), USB_DEVICE_DATA(&rt2800usb_ops) },
++ /* Alpha Networks */
++ { USB_DEVICE(0x14b2, 0x3c06), USB_DEVICE_DATA(&rt2800usb_ops) },
++ { USB_DEVICE(0x14b2, 0x3c07), USB_DEVICE_DATA(&rt2800usb_ops) },
++ { USB_DEVICE(0x14b2, 0x3c09), USB_DEVICE_DATA(&rt2800usb_ops) },
++ { USB_DEVICE(0x14b2, 0x3c12), USB_DEVICE_DATA(&rt2800usb_ops) },
++ { USB_DEVICE(0x14b2, 0x3c23), USB_DEVICE_DATA(&rt2800usb_ops) },
++ { USB_DEVICE(0x14b2, 0x3c25), USB_DEVICE_DATA(&rt2800usb_ops) },
++ { USB_DEVICE(0x14b2, 0x3c27), USB_DEVICE_DATA(&rt2800usb_ops) },
++ { USB_DEVICE(0x14b2, 0x3c28), USB_DEVICE_DATA(&rt2800usb_ops) },
++ { USB_DEVICE(0x14b2, 0x3c2c), USB_DEVICE_DATA(&rt2800usb_ops) },
+ /* Amit */
+ { USB_DEVICE(0x15c5, 0x0008), USB_DEVICE_DATA(&rt2800usb_ops) },
+ /* Askey */
+@@ -736,15 +746,7 @@ static struct usb_device_id rt2800usb_device_table[] = {
+ /* Buffalo */
+ { USB_DEVICE(0x0411, 0x00e8), USB_DEVICE_DATA(&rt2800usb_ops) },
+ { USB_DEVICE(0x0411, 0x016f), USB_DEVICE_DATA(&rt2800usb_ops) },
+- /* Conceptronic */
+- { USB_DEVICE(0x14b2, 0x3c06), USB_DEVICE_DATA(&rt2800usb_ops) },
+- { USB_DEVICE(0x14b2, 0x3c07), USB_DEVICE_DATA(&rt2800usb_ops) },
+- { USB_DEVICE(0x14b2, 0x3c09), USB_DEVICE_DATA(&rt2800usb_ops) },
+- { USB_DEVICE(0x14b2, 0x3c12), USB_DEVICE_DATA(&rt2800usb_ops) },
+- { USB_DEVICE(0x14b2, 0x3c23), USB_DEVICE_DATA(&rt2800usb_ops) },
+- { USB_DEVICE(0x14b2, 0x3c25), USB_DEVICE_DATA(&rt2800usb_ops) },
+- { USB_DEVICE(0x14b2, 0x3c27), USB_DEVICE_DATA(&rt2800usb_ops) },
+- { USB_DEVICE(0x14b2, 0x3c28), USB_DEVICE_DATA(&rt2800usb_ops) },
++ { USB_DEVICE(0x0411, 0x01a2), USB_DEVICE_DATA(&rt2800usb_ops) },
+ /* Corega */
+ { USB_DEVICE(0x07aa, 0x002f), USB_DEVICE_DATA(&rt2800usb_ops) },
+ { USB_DEVICE(0x07aa, 0x003c), USB_DEVICE_DATA(&rt2800usb_ops) },
+@@ -776,6 +778,8 @@ static struct usb_device_id rt2800usb_device_table[] = {
+ { USB_DEVICE(0x1740, 0x9707), USB_DEVICE_DATA(&rt2800usb_ops) },
+ { USB_DEVICE(0x1740, 0x9708), USB_DEVICE_DATA(&rt2800usb_ops) },
+ { USB_DEVICE(0x1740, 0x9709), USB_DEVICE_DATA(&rt2800usb_ops) },
++ /* Gemtek */
++ { USB_DEVICE(0x15a9, 0x0012), USB_DEVICE_DATA(&rt2800usb_ops) },
+ /* Gigabyte */
+ { USB_DEVICE(0x1044, 0x800b), USB_DEVICE_DATA(&rt2800usb_ops) },
+ { USB_DEVICE(0x1044, 0x800d), USB_DEVICE_DATA(&rt2800usb_ops) },
+@@ -792,6 +796,7 @@ static struct usb_device_id rt2800usb_device_table[] = {
+ { USB_DEVICE(0x04bb, 0x0947), USB_DEVICE_DATA(&rt2800usb_ops) },
+ { USB_DEVICE(0x04bb, 0x0948), USB_DEVICE_DATA(&rt2800usb_ops) },
+ /* Linksys */
++ { USB_DEVICE(0x13b1, 0x0031), USB_DEVICE_DATA(&rt2800usb_ops) },
+ { USB_DEVICE(0x1737, 0x0070), USB_DEVICE_DATA(&rt2800usb_ops) },
+ { USB_DEVICE(0x1737, 0x0071), USB_DEVICE_DATA(&rt2800usb_ops) },
+ /* Logitec */
+@@ -870,8 +875,9 @@ static struct usb_device_id rt2800usb_device_table[] = {
+ { USB_DEVICE(0x15a9, 0x0006), USB_DEVICE_DATA(&rt2800usb_ops) },
+ /* Sweex */
+ { USB_DEVICE(0x177f, 0x0302), USB_DEVICE_DATA(&rt2800usb_ops) },
+- /* U-Media*/
++ /* U-Media */
+ { USB_DEVICE(0x157e, 0x300e), USB_DEVICE_DATA(&rt2800usb_ops) },
++ { USB_DEVICE(0x157e, 0x3013), USB_DEVICE_DATA(&rt2800usb_ops) },
+ /* ZCOM */
+ { USB_DEVICE(0x0cde, 0x0022), USB_DEVICE_DATA(&rt2800usb_ops) },
+ { USB_DEVICE(0x0cde, 0x0025), USB_DEVICE_DATA(&rt2800usb_ops) },
+@@ -883,6 +889,7 @@ static struct usb_device_id rt2800usb_device_table[] = {
+ /* Zyxel */
+ { USB_DEVICE(0x0586, 0x3416), USB_DEVICE_DATA(&rt2800usb_ops) },
+ { USB_DEVICE(0x0586, 0x3418), USB_DEVICE_DATA(&rt2800usb_ops) },
++ { USB_DEVICE(0x0586, 0x341e), USB_DEVICE_DATA(&rt2800usb_ops) },
+ #ifdef CONFIG_RT2800USB_RT33XX
+ /* Ralink */
+ { USB_DEVICE(0x148f, 0x3370), USB_DEVICE_DATA(&rt2800usb_ops) },
+@@ -901,6 +908,8 @@ static struct usb_device_id rt2800usb_device_table[] = {
+ { USB_DEVICE(0x1740, 0x9801), USB_DEVICE_DATA(&rt2800usb_ops) },
+ /* I-O DATA */
+ { USB_DEVICE(0x04bb, 0x0944), USB_DEVICE_DATA(&rt2800usb_ops) },
++ /* Linksys */
++ { USB_DEVICE(0x13b1, 0x002f), USB_DEVICE_DATA(&rt2800usb_ops) },
+ /* Ralink */
+ { USB_DEVICE(0x148f, 0x3572), USB_DEVICE_DATA(&rt2800usb_ops) },
+ /* Sitecom */
+@@ -915,6 +924,9 @@ static struct usb_device_id rt2800usb_device_table[] = {
+ * Unclear what kind of devices these are (they aren't supported by the
+ * vendor linux driver).
+ */
++ /* Alpha Networks */
++ { USB_DEVICE(0x14b2, 0x3c08), USB_DEVICE_DATA(&rt2800usb_ops) },
++ { USB_DEVICE(0x14b2, 0x3c11), USB_DEVICE_DATA(&rt2800usb_ops) },
+ /* Amigo */
+ { USB_DEVICE(0x0e0b, 0x9031), USB_DEVICE_DATA(&rt2800usb_ops) },
+ { USB_DEVICE(0x0e0b, 0x9041), USB_DEVICE_DATA(&rt2800usb_ops) },
+@@ -933,9 +945,6 @@ static struct usb_device_id rt2800usb_device_table[] = {
+ { USB_DEVICE(0x0411, 0x0148), USB_DEVICE_DATA(&rt2800usb_ops) },
+ { USB_DEVICE(0x0411, 0x0150), USB_DEVICE_DATA(&rt2800usb_ops) },
+ { USB_DEVICE(0x0411, 0x015d), USB_DEVICE_DATA(&rt2800usb_ops) },
+- /* Conceptronic */
+- { USB_DEVICE(0x14b2, 0x3c08), USB_DEVICE_DATA(&rt2800usb_ops) },
+- { USB_DEVICE(0x14b2, 0x3c11), USB_DEVICE_DATA(&rt2800usb_ops) },
+ /* Corega */
+ { USB_DEVICE(0x07aa, 0x0041), USB_DEVICE_DATA(&rt2800usb_ops) },
+ { USB_DEVICE(0x07aa, 0x0042), USB_DEVICE_DATA(&rt2800usb_ops) },
+--
+1.7.4.4
+
Added: dists/trunk/linux-2.6/debian/patches/features/all/rt2x00-Add-support-for-the-ZyXEL-NWD-211AN-USB.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/rt2x00-Add-support-for-the-ZyXEL-NWD-211AN-USB.patch Fri May 13 04:51:41 2011 (r17395)
@@ -0,0 +1,29 @@
+From: Ivo van Doorn <IvDoorn at gmail.com>
+Date: Mon, 28 Mar 2011 13:34:50 +0200
+Subject: [PATCH] rt2x00: Add support for the ZyXEL NWD-211AN USB
+
+commit b35e77cf84137bbb4b6888dc90616eb0b452ea36 upstream.
+
+Add new USB ID
+
+Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
+---
+ drivers/net/wireless/rt2x00/rt2800usb.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
+index 8b3ab3f..262bf66 100644
+--- a/drivers/net/wireless/rt2x00/rt2800usb.c
++++ b/drivers/net/wireless/rt2x00/rt2800usb.c
+@@ -877,6 +877,7 @@ static struct usb_device_id rt2800usb_device_table[] = {
+ { USB_DEVICE(0x5a57, 0x5257), USB_DEVICE_DATA(&rt2800usb_ops) },
+ /* Zyxel */
+ { USB_DEVICE(0x0586, 0x3416), USB_DEVICE_DATA(&rt2800usb_ops) },
++ { USB_DEVICE(0x0586, 0x3418), USB_DEVICE_DATA(&rt2800usb_ops) },
+ #ifdef CONFIG_RT2800USB_RT33XX
+ /* Ralink */
+ { USB_DEVICE(0x148f, 0x3370), USB_DEVICE_DATA(&rt2800usb_ops) },
+--
+1.7.4.4
+
Added: dists/trunk/linux-2.6/debian/patches/features/all/rt2x00-Linksys-WUSB600N-rev2-is-a-RT3572-device.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/rt2x00-Linksys-WUSB600N-rev2-is-a-RT3572-device.patch Fri May 13 04:51:41 2011 (r17395)
@@ -0,0 +1,39 @@
+From: Gertjan van Wingerde <gwingerde at gmail.com>
+Date: Mon, 18 Apr 2011 15:31:50 +0200
+Subject: [PATCH] rt2x00: Linksys WUSB600N rev2 is a RT3572 device.
+
+commit ce2919c9fffe2aa52f9c3e327176d03764dbf9b5 upstream.
+
+Move the USB ID entry from the unknown devices to the list of RT35xx based
+devices.
+
+Signed-off-by: Gertjan van Wingerde <gwingerde at gmail.com>
+Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
+---
+ drivers/net/wireless/rt2x00/rt2800usb.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
+index 2005972..1bb9a7d 100644
+--- a/drivers/net/wireless/rt2x00/rt2800usb.c
++++ b/drivers/net/wireless/rt2x00/rt2800usb.c
+@@ -983,6 +983,7 @@ static struct usb_device_id rt2800usb_device_table[] = {
+ { USB_DEVICE(0x04bb, 0x0944), USB_DEVICE_DATA(&rt2800usb_ops) },
+ /* Linksys */
+ { USB_DEVICE(0x13b1, 0x002f), USB_DEVICE_DATA(&rt2800usb_ops) },
++ { USB_DEVICE(0x1737, 0x0079), USB_DEVICE_DATA(&rt2800usb_ops) },
+ /* Ralink */
+ { USB_DEVICE(0x148f, 0x3572), USB_DEVICE_DATA(&rt2800usb_ops) },
+ /* Sitecom */
+@@ -1041,7 +1042,6 @@ static struct usb_device_id rt2800usb_device_table[] = {
+ /* Linksys */
+ { USB_DEVICE(0x1737, 0x0077), USB_DEVICE_DATA(&rt2800usb_ops) },
+ { USB_DEVICE(0x1737, 0x0078), USB_DEVICE_DATA(&rt2800usb_ops) },
+- { USB_DEVICE(0x1737, 0x0079), USB_DEVICE_DATA(&rt2800usb_ops) },
+ /* Motorola */
+ { USB_DEVICE(0x100d, 0x9032), USB_DEVICE_DATA(&rt2800usb_ops) },
+ /* Ovislink */
+--
+1.7.4.4
+
Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.2
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.2 Fri May 13 04:38:34 2011 (r17394)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.2 Fri May 13 04:51:41 2011 (r17395)
@@ -1,2 +1,5 @@
+ features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch
+ debian/cgroups-Document-the-Debian-memory-resource-controll.patch
++ features/all/rt2x00-Add-support-for-the-ZyXEL-NWD-211AN-USB.patch
++ features/all/rt2800usb-Add-seven-new-USB-IDs.patch
++ features/all/rt2x00-Linksys-WUSB600N-rev2-is-a-RT3572-device.patch
More information about the Kernel-svn-changes
mailing list