Commit 8f8590dd authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'r8152-adjust-REALTEK_USB_DEVICE' 



Hayes Wang says:

====================
r8152: adjust REALTEK_USB_DEVICE

Modify REALTEK_USB_DEVICE macro.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7ce9c3d3 55319eeb

drivers/net/usb/r8152.c

+27 −44
Original line number Diff line number Diff line
@@ -9579,58 +9579,41 @@ static void rtl8152_disconnect(struct usb_interface *intf) 
	}

}



#define REALTEK_USB_DEVICE(vend, prod)	\

	.match_flags = USB_DEVICE_ID_MATCH_DEVICE | \

		       USB_DEVICE_ID_MATCH_INT_CLASS, \

	.idVendor = (vend), \

	.idProduct = (prod), \

	.bInterfaceClass = USB_CLASS_VENDOR_SPEC \

#define REALTEK_USB_DEVICE(vend, prod)	{ \

	USB_DEVICE_INTERFACE_CLASS(vend, prod, USB_CLASS_VENDOR_SPEC), \

}, \

{ \

	.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_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

	USB_DEVICE_AND_INTERFACE_INFO(vend, prod, USB_CLASS_COMM, \

			USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE), \

}



/* table of devices that work with this driver */

static const struct usb_device_id rtl8152_table[] = {

	/* Realtek */

	{REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8050)},

	{REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8053)},

	{REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8152)},

	{REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8153)},

	{REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8155)},

	{REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8156)},

	REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8050),

	REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8053),

	REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8152),

	REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8153),

	REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8155),

	REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8156),



	/* Microsoft */

	{REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07ab)},

	{REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07c6)},

	{REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x0927)},

	{REALTEK_USB_DEVICE(VENDOR_ID_SAMSUNG, 0xa101)},

	{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x304f)},

	{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x3062)},

	{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x3069)},

	{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x3082)},

	{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x7205)},

	{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x720c)},

	{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x7214)},

	{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x721e)},

	{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0xa387)},

	{REALTEK_USB_DEVICE(VENDOR_ID_LINKSYS, 0x0041)},

	{REALTEK_USB_DEVICE(VENDOR_ID_NVIDIA,  0x09ff)},

	{REALTEK_USB_DEVICE(VENDOR_ID_TPLINK,  0x0601)},

	REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07ab),

	REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07c6),

	REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x0927),

	REALTEK_USB_DEVICE(VENDOR_ID_SAMSUNG, 0xa101),

	REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x304f),

	REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x3062),

	REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x3069),

	REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x3082),

	REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x7205),

	REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x720c),

	REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x7214),

	REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x721e),

	REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0xa387),

	REALTEK_USB_DEVICE(VENDOR_ID_LINKSYS, 0x0041),

	REALTEK_USB_DEVICE(VENDOR_ID_NVIDIA,  0x09ff),

	REALTEK_USB_DEVICE(VENDOR_ID_TPLINK,  0x0601),

	{}

};