From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 25 Apr 2018 10:30:40 +0000 (+0200)
Subject: 4.4-stable patches
X-Git-Tag: v4.16.5~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=42716ac062cc676e96e1ec273f64ae2c40c58a04;p=thirdparty%2Fkernel%2Fstable-queue.git

4.4-stable patches

added patches:
	r8152-add-linksys-usb3gigv1-id.patch
---

diff --git a/queue-4.4/r8152-add-linksys-usb3gigv1-id.patch b/queue-4.4/r8152-add-linksys-usb3gigv1-id.patch
new file mode 100644
index 00000000000..ea69a859865
--- /dev/null
+++ b/queue-4.4/r8152-add-linksys-usb3gigv1-id.patch
@@ -0,0 +1,68 @@
+From 90841047a01b452cc8c3f9b990698b264143334a Mon Sep 17 00:00:00 2001
+From: Grant Grundler <grundler@chromium.org>
+Date: Thu, 28 Sep 2017 11:35:00 -0700
+Subject: r8152: add Linksys USB3GIGV1 id
+
+From: Grant Grundler <grundler@chromium.org>
+
+commit 90841047a01b452cc8c3f9b990698b264143334a upstream.
+
+This linksys dongle by default comes up in cdc_ether mode.
+This patch allows r8152 to claim the device:
+   Bus 002 Device 002: ID 13b1:0041 Linksys
+
+Signed-off-by: Grant Grundler <grundler@chromium.org>
+Reviewed-by: Douglas Anderson <dianders@chromium.org>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+[krzk: Rebase on v4.4]
+Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/usb/cdc_ether.c |   10 ++++++++++
+ drivers/net/usb/r8152.c     |    2 ++
+ 2 files changed, 12 insertions(+)
+
+--- a/drivers/net/usb/cdc_ether.c
++++ b/drivers/net/usb/cdc_ether.c
+@@ -461,6 +461,7 @@ static const struct driver_info wwan_inf
+ #define REALTEK_VENDOR_ID	0x0bda
+ #define SAMSUNG_VENDOR_ID	0x04e8
+ #define LENOVO_VENDOR_ID	0x17ef
++#define LINKSYS_VENDOR_ID	0x13b1
+ #define NVIDIA_VENDOR_ID	0x0955
+ #define HP_VENDOR_ID		0x03f0
+ 
+@@ -650,6 +651,15 @@ static const struct usb_device_id	produc
+ 	.driver_info = 0,
+ },
+ 
++#if IS_ENABLED(CONFIG_USB_RTL8152)
++/* Linksys USB3GIGV1 Ethernet Adapter */
++{
++	USB_DEVICE_AND_INTERFACE_INFO(LINKSYS_VENDOR_ID, 0x0041, USB_CLASS_COMM,
++			USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
++	.driver_info = 0,
++},
++#endif
++
+ /* Lenovo Thinkpad USB 3.0 Ethernet Adapters (based on Realtek RTL8153) */
+ {
+ 	USB_DEVICE_AND_INTERFACE_INFO(LENOVO_VENDOR_ID, 0x7205, USB_CLASS_COMM,
+--- a/drivers/net/usb/r8152.c
++++ b/drivers/net/usb/r8152.c
+@@ -506,6 +506,7 @@ enum rtl8152_flags {
+ #define VENDOR_ID_REALTEK		0x0bda
+ #define VENDOR_ID_SAMSUNG		0x04e8
+ #define VENDOR_ID_LENOVO		0x17ef
++#define VENDOR_ID_LINKSYS		0x13b1
+ #define VENDOR_ID_NVIDIA		0x0955
+ 
+ #define MCU_TYPE_PLA			0x0100
+@@ -4376,6 +4377,7 @@ static struct usb_device_id rtl8152_tabl
+ 	{REALTEK_USB_DEVICE(VENDOR_ID_SAMSUNG, 0xa101)},
+ 	{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x7205)},
+ 	{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x304f)},
++	{REALTEK_USB_DEVICE(VENDOR_ID_LINKSYS, 0x0041)},
+ 	{REALTEK_USB_DEVICE(VENDOR_ID_NVIDIA,  0x09ff)},
+ 	{}
+ };
diff --git a/queue-4.4/series b/queue-4.4/series
index 07505726c06..82149704d38 100644
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -2,3 +2,4 @@ cifs-do-not-allow-creating-sockets-except-with-smb1-posix-exensions.patch
 x86-tsc-prevent-32bit-truncation-in-calc_hpet_ref.patch
 perf-return-proper-values-for-user-stack-errors.patch
 staging-ion-donnot-wakeup-kswapd-in-ion-system-alloc.patch
+r8152-add-linksys-usb3gigv1-id.patch