summaryrefslogtreecommitdiff
path: root/drivers/net/usb/cdc_ether.c
diff options
context:
space:
mode:
authorhayeswang <hayeswang@realtek.com>2014-01-15 06:42:16 +0400
committerDavid S. Miller <davem@davemloft.net>2014-01-15 06:48:54 +0400
commitc7de7dec2ff2528ec630c55e68c25bd9d972b677 (patch)
tree3f1a03819a3effb74641ba8cd50c00002f5635f8 /drivers/net/usb/cdc_ether.c
parent9629e3c037a1ede32b70d9ae2ab131cdfb872df8 (diff)
downloadlinux-c7de7dec2ff2528ec630c55e68c25bd9d972b677.tar.xz
r8152: ecm and vendor modes coexist
Remove the limitation that the ecm and r8152 drivers couldn't coexist. - Remove the devices from the blacklist of relative drivers. - Remove usb_driver_set_configuration() from r8152 driver. - Modify the id_table of the r8152 driver for the vendor mode only. Signed-off-by: Hayes Wang <hayeswang@realtek.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb/cdc_ether.c')
-rw-r--r--drivers/net/usb/cdc_ether.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
index 640406ac4358..7d32be89e3ca 100644
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
@@ -653,15 +653,6 @@ static const struct usb_device_id products[] = {
.driver_info = 0,
},
-#if defined(CONFIG_USB_RTL8152) || defined(CONFIG_USB_RTL8152_MODULE)
-/* Samsung USB Ethernet Adapters */
-{
- USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, 0xa101, USB_CLASS_COMM,
- USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
- .driver_info = 0,
-},
-#endif
-
/* WHITELIST!!!
*
* CDC Ether uses two interfaces, not necessarily consecutive.