From 274f1b2efc153f5c77c528a4ab70ea02178b2dd5 Mon Sep 17 00:00:00 2001 From: Geoff Holden Date: Sat, 9 Sep 2017 15:10:15 -0230 Subject: [PATCH] Remove Surface Dock from cdc_ether blacklist. The surface dock (brick-style at least) ethernet does not work with the r8152 driver. This change lets the cdc_ether driver handle the device instead, which does work. --- kernel/drivers/net/usb/cdc_ether.c | 7 ------- kernel/drivers/net/usb/r8152.c | 1 - 2 files changed, 8 deletions(-) diff --git a/kernel/drivers/net/usb/cdc_ether.c b/kernel/drivers/net/usb/cdc_ether.c index 8ab281b47..1c4e0f36d 100644 --- a/kernel/drivers/net/usb/cdc_ether.c +++ b/kernel/drivers/net/usb/cdc_ether.c @@ -786,13 +786,6 @@ static const struct usb_device_id products[] = { .driver_info = 0, }, -/* Microsoft Surface 3 dock (based on Realtek RTL8153) */ -{ - USB_DEVICE_AND_INTERFACE_INFO(MICROSOFT_VENDOR_ID, 0x07c6, USB_CLASS_COMM, - USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE), - .driver_info = 0, -}, - /* WHITELIST!!! * * CDC Ether uses two interfaces, not necessarily consecutive. diff --git a/kernel/drivers/net/usb/r8152.c b/kernel/drivers/net/usb/r8152.c index ceb78e2ea..0b0be72d1 100644 --- a/kernel/drivers/net/usb/r8152.c +++ b/kernel/drivers/net/usb/r8152.c @@ -5308,7 +5308,6 @@ static const struct usb_device_id rtl8152_table[] = { {REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8152)}, {REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8153)}, {REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07ab)}, - {REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07c6)}, {REALTEK_USB_DEVICE(VENDOR_ID_SAMSUNG, 0xa101)}, {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x304f)}, {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x3062)},