Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d596df3a authored by Dmitry Bezrukov's avatar Dmitry Bezrukov Committed by David S. Miller
Browse files

net: usb: aqc111: Extend cdc_ether blacklist 



Added Aquantia and ASIX device IDs to prevent loading cdc_ether for
these devices. Our firmware reports CDC configuration simultaneously
with vendor specific.

Signed-off-by: default avatarDmitry Bezrukov <dmitry.bezrukov@aquantia.com>
Signed-off-by: default avatarIgor Russkikh <igor.russkikh@aquantia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fa61ce4d

drivers/net/usb/cdc_ether.c

+26 −0
Original line number Diff line number Diff line
@@ -562,6 +562,8 @@ static const struct driver_info wwan_info = { 
#define MICROSOFT_VENDOR_ID	0x045e

#define UBLOX_VENDOR_ID		0x1546

#define TPLINK_VENDOR_ID	0x2357

#define AQUANTIA_VENDOR_ID	0x2eca

#define ASIX_VENDOR_ID		0x0b95



static const struct usb_device_id	products[] = {

/* BLACKLIST !!
@@ -821,6 +823,30 @@ static const struct usb_device_id products[] = { 
	.driver_info = 0,

},



/* Aquantia AQtion USB to 5GbE Controller (based on AQC111U) */

{

	USB_DEVICE_AND_INTERFACE_INFO(AQUANTIA_VENDOR_ID, 0xc101,

				      USB_CLASS_COMM, USB_CDC_SUBCLASS_ETHERNET,

				      USB_CDC_PROTO_NONE),

	.driver_info = 0,

},



/* ASIX USB 3.1 Gen1 to 5G Multi-Gigabit Ethernet Adapter(based on AQC111U) */

{

	USB_DEVICE_AND_INTERFACE_INFO(ASIX_VENDOR_ID, 0x2790, USB_CLASS_COMM,

				      USB_CDC_SUBCLASS_ETHERNET,

				      USB_CDC_PROTO_NONE),

	.driver_info = 0,

},



/* ASIX USB 3.1 Gen1 to 2.5G Multi-Gigabit Ethernet Adapter(based on AQC112U) */

{

	USB_DEVICE_AND_INTERFACE_INFO(ASIX_VENDOR_ID, 0x2791, USB_CLASS_COMM,

				      USB_CDC_SUBCLASS_ETHERNET,

				      USB_CDC_PROTO_NONE),

	.driver_info = 0,

},



/* WHITELIST!!!

 *

 * CDC Ether uses two interfaces, not necessarily consecutive.