OSDN Git Service

r8152: remove NCM mode from REALTEK_USB_DEVICE macro
authorHayes Wang <hayeswang@realtek.com>
Fri, 23 Apr 2021 09:44:54 +0000 (17:44 +0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 23 Apr 2021 20:55:42 +0000 (13:55 -0700)
The RTL8156 support CDC NCM mode. And users could set the configuration
of the USB device between vendor and NCM mode dynamically by themselves.
That is, the driver doesn't need to set vendor mode from NCM mode.

Fixes: 195aae321c82 ("r8152: support new chips")
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/r8152.c

index 5b4ed69..47198c1 100644 (file)
@@ -9593,15 +9593,6 @@ static void rtl8152_disconnect(struct usb_interface *intf)
        .idProduct = (prod), \
        .bInterfaceClass = USB_CLASS_COMM, \
        .bInterfaceSubClass = USB_CDC_SUBCLASS_ETHERNET, \
-       .bInterfaceProtocol = USB_CDC_PROTO_NONE \
-}, \
-{ \
-       .match_flags = USB_DEVICE_ID_MATCH_INT_INFO | \
-                      USB_DEVICE_ID_MATCH_DEVICE, \
-       .idVendor = (vend), \
-       .idProduct = (prod), \
-       .bInterfaceClass = USB_CLASS_COMM, \
-       .bInterfaceSubClass = USB_CDC_SUBCLASS_NCM, \
        .bInterfaceProtocol = USB_CDC_PROTO_NONE
 
 /* table of devices that work with this driver */