From: Greg Kroah-Hartman Date: Fri, 27 Sep 2013 15:48:02 +0000 (-0700) Subject: 3.10-stable patches X-Git-Tag: v3.0.98~46 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8d65a191c810c6c301b7199a5db3612c4c894553;p=thirdparty%2Fkernel%2Fstable-queue.git 3.10-stable patches added patches: rt2x00-rt2800usb-add-usb-device-id-for-linksys-ae3000.patch wireless-rt2x00-rt2800usb-add-rt3573-devices.patch --- diff --git a/queue-3.10/rt2x00-rt2800usb-add-usb-device-id-for-linksys-ae3000.patch b/queue-3.10/rt2x00-rt2800usb-add-usb-device-id-for-linksys-ae3000.patch new file mode 100644 index 00000000000..4af55db99b3 --- /dev/null +++ b/queue-3.10/rt2x00-rt2800usb-add-usb-device-id-for-linksys-ae3000.patch @@ -0,0 +1,60 @@ +From d02433d15566f542e42e3c469dfade0de332dc7b Mon Sep 17 00:00:00 2001 +From: Gabor Juhos +Date: Mon, 8 Jul 2013 16:08:35 +0200 +Subject: rt2x00: rt2800usb: add USB device ID for Linksys AE3000 + +From: Gabor Juhos + +commit d02433d15566f542e42e3c469dfade0de332dc7b upstream. + +The Linksys AE3000 device is based on the RT3573 +chipset. The support for this chipset is available +already, and the AE3000 device works with the driver. + +Only managed mode works correctly at the moment, +for AP mode additional changes are needed in the +driver. + +Also add a new RT2800USB_RT3573 Kconfig option and +only enable support for RT3573 based devices if +that is enabled. + +Signed-off-by: Gabor Juhos +Acked-by: Stanislaw Gruszka +Acked-by: Gertjan van Wingerde +Signed-off-by: John W. Linville +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/wireless/rt2x00/Kconfig | 6 ++++++ + drivers/net/wireless/rt2x00/rt2800usb.c | 4 ++++ + 2 files changed, 10 insertions(+) + +--- a/drivers/net/wireless/rt2x00/Kconfig ++++ b/drivers/net/wireless/rt2x00/Kconfig +@@ -166,6 +166,12 @@ config RT2800USB_RT35XX + rt2800usb driver. + Supported chips: RT3572 + ++config RT2800USB_RT3573 ++ bool "rt2800usb - Include support for rt3573 devices (EXPERIMENTAL)" ++ ---help--- ++ This enables support for RT3573 chipset based wireless USB devices ++ in the rt2800usb driver. ++ + config RT2800USB_RT53XX + bool "rt2800usb - Include support for rt53xx devices (EXPERIMENTAL)" + ---help--- +--- a/drivers/net/wireless/rt2x00/rt2800usb.c ++++ b/drivers/net/wireless/rt2x00/rt2800usb.c +@@ -1216,6 +1216,10 @@ static struct usb_device_id rt2800usb_de + /* Zinwell */ + { USB_DEVICE(0x5a57, 0x0284) }, + #endif ++#ifdef CONFIG_RT2800USB_RT3573 ++ /* Linksys */ ++ { USB_DEVICE(0x13b1, 0x003b) }, ++#endif + #ifdef CONFIG_RT2800USB_RT53XX + /* Arcadyan */ + { USB_DEVICE(0x043e, 0x7a12) }, diff --git a/queue-3.10/series b/queue-3.10/series new file mode 100644 index 00000000000..eede67a2759 --- /dev/null +++ b/queue-3.10/series @@ -0,0 +1,2 @@ +rt2x00-rt2800usb-add-usb-device-id-for-linksys-ae3000.patch +wireless-rt2x00-rt2800usb-add-rt3573-devices.patch diff --git a/queue-3.10/wireless-rt2x00-rt2800usb-add-rt3573-devices.patch b/queue-3.10/wireless-rt2x00-rt2800usb-add-rt3573-devices.patch new file mode 100644 index 00000000000..3e0721100a1 --- /dev/null +++ b/queue-3.10/wireless-rt2x00-rt2800usb-add-rt3573-devices.patch @@ -0,0 +1,83 @@ +From 637065267eab4817c0b06cbf3c7fc80842acab99 Mon Sep 17 00:00:00 2001 +From: Xose Vazquez Perez +Date: Tue, 23 Jul 2013 14:55:15 +0200 +Subject: wireless: rt2x00: rt2800usb: add RT3573 devices + +From: Xose Vazquez Perez + +commit 637065267eab4817c0b06cbf3c7fc80842acab99 upstream. + +taken from Ralink linux and windows drivers: + +0x1b75, 0x7733 AirLive 450Mbps Wireless-N Dual Band USB Adapter +0x0b05, 0x17bc ASUS USB-N66 450Mbps Dual Band USB Adapter +0x0b05, 0x17ad ASUS USB-N66 Dual Band N Network Adapter +0x050d, 0x1103 Belkin Wireless Adapter +0x148f, 0xf301 Cameo Ralink3573 3x3 single band USB dongle +0x7392, 0x7733 Edimax +0x0e66, 0x0020 Hawking HD45U Dual Band USB Wireless-N Adapter +0x0e66, 0x0021 Hawking HD45U Dual Band Wls-450N Adapter +0x04bb, 0x094e I-O DATA WN-AG450U Wireless LAN Adapter +0x0789, 0x016b Logitec LAN-W450AN/U2 +0x0846, 0x9012 NETGEAR WNDA4100 N900 Wireless Dual Band USB Adapter +0x0846, 0x9019 NETGEAR WNDA4200D Wireless Dual Band USB Adapter +0x2019, 0xed19 Planex GW-USDual450 +0x148f, 0x3573 Ralink 802.11n USB Wireless LAN Card +0x0df6, 0x0067 Sitecom Wireless Dualband Network Adapter N750 X6 +0x0df6, 0x006a Sitecom Wireless Dualband Network Adapter N900 X7 +0x0586, 0x3421 ZyXEL Dual-Band Wireless N450 USB Adapter + +Cc: Ivo van Doorn +Cc: Gertjan van Wingerde +Cc: Helmut Schaa +Cc: John W. Linville +Cc: John Vert +Signed-off-by: Xose Vazquez Perez +Signed-off-by: John W. Linville +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/wireless/rt2x00/rt2800usb.c | 30 ++++++++++++++++++++++++++++++ + 1 file changed, 30 insertions(+) + +--- a/drivers/net/wireless/rt2x00/rt2800usb.c ++++ b/drivers/net/wireless/rt2x00/rt2800usb.c +@@ -1217,8 +1217,38 @@ static struct usb_device_id rt2800usb_de + { USB_DEVICE(0x5a57, 0x0284) }, + #endif + #ifdef CONFIG_RT2800USB_RT3573 ++ /* AirLive */ ++ { USB_DEVICE(0x1b75, 0x7733) }, ++ /* ASUS */ ++ { USB_DEVICE(0x0b05, 0x17bc) }, ++ { USB_DEVICE(0x0b05, 0x17ad) }, ++ /* Belkin */ ++ { USB_DEVICE(0x050d, 0x1103) }, ++ /* Cameo */ ++ { USB_DEVICE(0x148f, 0xf301) }, ++ /* Edimax */ ++ { USB_DEVICE(0x7392, 0x7733) }, ++ /* Hawking */ ++ { USB_DEVICE(0x0e66, 0x0020) }, ++ { USB_DEVICE(0x0e66, 0x0021) }, ++ /* I-O DATA */ ++ { USB_DEVICE(0x04bb, 0x094e) }, + /* Linksys */ + { USB_DEVICE(0x13b1, 0x003b) }, ++ /* Logitec */ ++ { USB_DEVICE(0x0789, 0x016b) }, ++ /* NETGEAR */ ++ { USB_DEVICE(0x0846, 0x9012) }, ++ { USB_DEVICE(0x0846, 0x9019) }, ++ /* Planex */ ++ { USB_DEVICE(0x2019, 0xed19) }, ++ /* Ralink */ ++ { USB_DEVICE(0x148f, 0x3573) }, ++ /* Sitecom */ ++ { USB_DEVICE(0x0df6, 0x0067) }, ++ { USB_DEVICE(0x0df6, 0x006a) }, ++ /* ZyXEL */ ++ { USB_DEVICE(0x0586, 0x3421) }, + #endif + #ifdef CONFIG_RT2800USB_RT53XX + /* Arcadyan */