git.openwrt.org Git - openwrt/staging/ldir.git/blob

   1 From 69649ef8405320f81497f4757faac8234f61b167 Mon Sep 17 00:00:00 2001
   2 From: Bjørn Mork <bjorn@mork.no>
   3 Date: Fri, 6 Jan 2023 17:07:39 +0100
   4 Subject: [PATCH] cdc_ether: no need to blacklist any r8152 devices
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 The r8152 driver does not need this anymore.
  10
  11 Dropping blacklist entries adds optional support for these
  12 devices in ECM mode.
  13
  14 The 8153 devices are handled by the r8153_ecm driver when
  15 in ECM mode, and must still be blacklisted here.
  16
  17 Signed-off-by: Bjørn Mork <bjorn@mork.no>
  18 Signed-off-by: David S. Miller <davem@davemloft.net>
  19 ---
  20  drivers/net/usb/cdc_ether.c | 114 ------------------------------------
  21  1 file changed, 114 deletions(-)
  22
  23 --- a/drivers/net/usb/cdc_ether.c
  24 +++ b/drivers/net/usb/cdc_ether.c
  25 @@ -768,13 +768,6 @@ static const struct usb_device_id  produc
  26         .driver_info = 0,
  27  },
  28
  29 -/* Realtek RTL8152 Based USB 2.0 Ethernet Adapters */
  30 -{
  31 -       USB_DEVICE_AND_INTERFACE_INFO(REALTEK_VENDOR_ID, 0x8152, USB_CLASS_COMM,
  32 -                       USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
  33 -       .driver_info = 0,
  34 -},
  35 -
  36  /* Realtek RTL8153 Based USB 3.0 Ethernet Adapters */
  37  {
  38         USB_DEVICE_AND_INTERFACE_INFO(REALTEK_VENDOR_ID, 0x8153, USB_CLASS_COMM,
  39 @@ -782,119 +775,12 @@ static const struct usb_device_id        produc
  40         .driver_info = 0,
  41  },
  42
  43 -/* Samsung USB Ethernet Adapters */
  44 -{
  45 -       USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, 0xa101, USB_CLASS_COMM,
  46 -                       USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
  47 -       .driver_info = 0,
  48 -},
  49 -
  50 -#if IS_ENABLED(CONFIG_USB_RTL8152)
  51 -/* Linksys USB3GIGV1 Ethernet Adapter */
  52 -{
  53 -       USB_DEVICE_AND_INTERFACE_INFO(LINKSYS_VENDOR_ID, 0x0041, USB_CLASS_COMM,
  54 -                       USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
  55 -       .driver_info = 0,
  56 -},
  57 -#endif
  58 -
  59 -/* Lenovo ThinkPad OneLink+ Dock (based on Realtek RTL8153) */
  60 -{
  61 -       USB_DEVICE_AND_INTERFACE_INFO(LENOVO_VENDOR_ID, 0x3054, USB_CLASS_COMM,
  62 -                       USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
  63 -       .driver_info = 0,
  64 -},
  65 -
  66 -/* ThinkPad USB-C Dock (based on Realtek RTL8153) */
  67 -{
  68 -       USB_DEVICE_AND_INTERFACE_INFO(LENOVO_VENDOR_ID, 0x3062, USB_CLASS_COMM,
  69 -                       USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
  70 -       .driver_info = 0,
  71 -},
  72 -
  73 -/* ThinkPad Thunderbolt 3 Dock (based on Realtek RTL8153) */
  74 -{
  75 -       USB_DEVICE_AND_INTERFACE_INFO(LENOVO_VENDOR_ID, 0x3069, USB_CLASS_COMM,
  76 -                       USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
  77 -       .driver_info = 0,
  78 -},
  79 -
  80 -/* ThinkPad Thunderbolt 3 Dock Gen 2 (based on Realtek RTL8153) */
  81 -{
  82 -       USB_DEVICE_AND_INTERFACE_INFO(LENOVO_VENDOR_ID, 0x3082, USB_CLASS_COMM,
  83 -                       USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
  84 -       .driver_info = 0,
  85 -},
  86 -
  87 -/* Lenovo Thinkpad USB 3.0 Ethernet Adapters (based on Realtek RTL8153) */
  88 -{
  89 -       USB_DEVICE_AND_INTERFACE_INFO(LENOVO_VENDOR_ID, 0x7205, USB_CLASS_COMM,
  90 -                       USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
  91 -       .driver_info = 0,
  92 -},
  93 -
  94 -/* Lenovo USB C to Ethernet Adapter (based on Realtek RTL8153) */
  95 -{
  96 -       USB_DEVICE_AND_INTERFACE_INFO(LENOVO_VENDOR_ID, 0x720c, USB_CLASS_COMM,
  97 -                       USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
  98 -       .driver_info = 0,
  99 -},
 100 -
 101 -/* Lenovo USB-C Travel Hub (based on Realtek RTL8153) */
 102 -{
 103 -       USB_DEVICE_AND_INTERFACE_INFO(LENOVO_VENDOR_ID, 0x7214, USB_CLASS_COMM,
 104 -                       USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
 105 -       .driver_info = 0,
 106 -},
 107 -
 108  /* Lenovo Powered USB-C Travel Hub (4X90S92381, based on Realtek RTL8153) */
 109  {
 110         USB_DEVICE_AND_INTERFACE_INFO(LENOVO_VENDOR_ID, 0x721e, USB_CLASS_COMM,
 111                         USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
 112         .driver_info = 0,
 113  },
 114 -
 115 -/* ThinkPad USB-C Dock Gen 2 (based on Realtek RTL8153) */
 116 -{
 117 -       USB_DEVICE_AND_INTERFACE_INFO(LENOVO_VENDOR_ID, 0xa387, USB_CLASS_COMM,
 118 -                       USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
 119 -       .driver_info = 0,
 120 -},
 121 -
 122 -/* NVIDIA Tegra USB 3.0 Ethernet Adapters (based on Realtek RTL8153) */
 123 -{
 124 -       USB_DEVICE_AND_INTERFACE_INFO(NVIDIA_VENDOR_ID, 0x09ff, USB_CLASS_COMM,
 125 -                       USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
 126 -       .driver_info = 0,
 127 -},
 128 -
 129 -/* Microsoft Surface 2 dock (based on Realtek RTL8152) */
 130 -{
 131 -       USB_DEVICE_AND_INTERFACE_INFO(MICROSOFT_VENDOR_ID, 0x07ab, USB_CLASS_COMM,
 132 -                       USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
 133 -       .driver_info = 0,
 134 -},
 135 -
 136 -/* Microsoft Surface Ethernet Adapter (based on Realtek RTL8153) */
 137 -{
 138 -       USB_DEVICE_AND_INTERFACE_INFO(MICROSOFT_VENDOR_ID, 0x07c6, USB_CLASS_COMM,
 139 -                       USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
 140 -       .driver_info = 0,
 141 -},
 142 -
 143 -/* Microsoft Surface Ethernet Adapter (based on Realtek RTL8153B) */
 144 -{
 145 -       USB_DEVICE_AND_INTERFACE_INFO(MICROSOFT_VENDOR_ID, 0x0927, USB_CLASS_COMM,
 146 -                       USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
 147 -       .driver_info = 0,
 148 -},
 149 -
 150 -/* TP-LINK UE300 USB 3.0 Ethernet Adapters (based on Realtek RTL8153) */
 151 -{
 152 -       USB_DEVICE_AND_INTERFACE_INFO(TPLINK_VENDOR_ID, 0x0601, USB_CLASS_COMM,
 153 -                       USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
 154 -       .driver_info = 0,
 155 -},
 156
 157  /* Aquantia AQtion USB to 5GbE Controller (based on AQC111U) */
 158  {