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

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

net: usb: aqc111: Extend HWID table by TRENDnet device 



New device of TRENDnet based on aqc111u
Add this ID to blacklist of cdc_ether driver as well

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 cd0c4e70

drivers/net/usb/aqc111.c

+15 −0
Original line number Original line Diff line number Diff line
@@ -1287,6 +1287,20 @@ static const struct driver_info asix112_info = { 




#undef ASIX112_DESC

#undef ASIX112_DESC





static const struct driver_info trendnet_info = {

	.description	= "USB-C 3.1 to 5GBASE-T Ethernet Adapter",

	.bind		= aqc111_bind,

	.unbind		= aqc111_unbind,

	.status		= aqc111_status,

	.link_reset	= aqc111_link_reset,

	.reset		= aqc111_reset,

	.stop		= aqc111_stop,

	.flags		= FLAG_ETHER | FLAG_FRAMING_AX |

			  FLAG_AVOID_UNLINK_URBS | FLAG_MULTI_PACKET,

	.rx_fixup	= aqc111_rx_fixup,

	.tx_fixup	= aqc111_tx_fixup,

};



static int aqc111_suspend(struct usb_interface *intf, pm_message_t message)

static int aqc111_suspend(struct usb_interface *intf, pm_message_t message)

{

{

	struct usbnet *dev = usb_get_intfdata(intf);

	struct usbnet *dev = usb_get_intfdata(intf);
@@ -1440,6 +1454,7 @@ static const struct usb_device_id products[] = { 
	{AQC111_USB_ETH_DEV(0x2eca, 0xc101, aqc111_info)},

	{AQC111_USB_ETH_DEV(0x2eca, 0xc101, aqc111_info)},

	{AQC111_USB_ETH_DEV(0x0b95, 0x2790, asix111_info)},

	{AQC111_USB_ETH_DEV(0x0b95, 0x2790, asix111_info)},

	{AQC111_USB_ETH_DEV(0x0b95, 0x2791, asix112_info)},

	{AQC111_USB_ETH_DEV(0x0b95, 0x2791, asix112_info)},

	{AQC111_USB_ETH_DEV(0x20f4, 0xe05a, trendnet_info)},

	{ },/* END */

	{ },/* END */

};

};

MODULE_DEVICE_TABLE(usb, products);

MODULE_DEVICE_TABLE(usb, products);

drivers/net/usb/cdc_ether.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -843,6 +843,14 @@ static const struct usb_device_id products[] = { 
	.driver_info = 0,

	.driver_info = 0,

},

},





/* USB-C 3.1 to 5GBASE-T Ethernet Adapter (based on AQC111U) */

{

	USB_DEVICE_AND_INTERFACE_INFO(0x20f4, 0xe05a, USB_CLASS_COMM,

				      USB_CDC_SUBCLASS_ETHERNET,

				      USB_CDC_PROTO_NONE),

	.driver_info = 0,

},



/* WHITELIST!!!

/* WHITELIST!!!

 *

 *

 * CDC Ether uses two interfaces, not necessarily consecutive.

 * CDC Ether uses two interfaces, not necessarily consecutive.