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

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



New device of QNAP 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 avatarDavid S. Miller <davem@davemloft.net>
parent 1f8389bf

drivers/net/usb/aqc111.c

+15 −0
Original line number Diff line number Diff line
@@ -1301,6 +1301,20 @@ static const struct driver_info trendnet_info = { 
	.tx_fixup	= aqc111_tx_fixup,

};



static const struct driver_info qnap_info = {

	.description	= "QNAP QNA-UC5G1T USB to 5GbE 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)

{

	struct usbnet *dev = usb_get_intfdata(intf);
@@ -1455,6 +1469,7 @@ static const struct usb_device_id products[] = { 
	{AQC111_USB_ETH_DEV(0x0b95, 0x2790, asix111_info)},

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

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

	{AQC111_USB_ETH_DEV(0x1c04, 0x0015, qnap_info)},

	{ },/* END */

};

MODULE_DEVICE_TABLE(usb, products);

drivers/net/usb/cdc_ether.c

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

},



/* QNAP QNA-UC5G1T USB to 5GbE Adapter (based on AQC111U) */

{

	USB_DEVICE_AND_INTERFACE_INFO(0x1c04, 0x0015, USB_CLASS_COMM,

				      USB_CDC_SUBCLASS_ETHERNET,

				      USB_CDC_PROTO_NONE),

	.driver_info = 0,

},



/* WHITELIST!!!

 *

 * CDC Ether uses two interfaces, not necessarily consecutive.