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

Commit 4b903e30 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'r8152' 



Hayes Wang says:

====================
support new chip

Remove the trailing "/* CRC */" for patch #3.

Change the return value type of rtl_ops_init() from int to boolean
for patch #4.

Replace VENDOR_ID_SAMSUNG with SAMSUNG_VENDOR_ID for patch #6.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 63d515c3 43779f8d

drivers/net/usb/cdc_ether.c

+10 −0
Original line number Diff line number Diff line
@@ -486,6 +486,7 @@ static const struct driver_info wwan_info = { 
#define ZTE_VENDOR_ID		0x19D2

#define DELL_VENDOR_ID		0x413C

#define REALTEK_VENDOR_ID	0x0bda

#define SAMSUNG_VENDOR_ID	0x04e8



static const struct usb_device_id	products[] = {

/* BLACKLIST !!
@@ -652,6 +653,15 @@ static const struct usb_device_id products[] = { 
	.driver_info = 0,

},



#if defined(CONFIG_USB_RTL8152) || defined(CONFIG_USB_RTL8152_MODULE)

/* Samsung USB Ethernet Adapters */

{

	USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, 0xa101, USB_CLASS_COMM,

			USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),

	.driver_info = 0,

},

#endif



/* WHITELIST!!!

 *

 * CDC Ether uses two interfaces, not necessarily consecutive.

drivers/net/usb/r8152.c

+731 −82

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/usb/r815x.c

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ static const struct usb_device_id products[] = { 
{

	USB_DEVICE_AND_INTERFACE_INFO(REALTEK_VENDOR_ID, 0x8153, USB_CLASS_COMM,

			USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),

#if defined(CONFIG_USB_RTL8153) || defined(CONFIG_USB_RTL8153_MODULE)

#if defined(CONFIG_USB_RTL8152) || defined(CONFIG_USB_RTL8152_MODULE)

	.driver_info = 0,

#else

	.driver_info = (unsigned long) &r8153_info,