Skip to content

Commit

Permalink
Merge branch 'r8152'
Browse files Browse the repository at this point in the history
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: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Jan 2, 2014
2 parents 63d515c + 43779f8 commit 4b903e3
Show file tree
Hide file tree
Showing 3 changed files with 742 additions and 83 deletions.
10 changes: 10 additions & 0 deletions drivers/net/usb/cdc_ether.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 !!
Expand Down Expand Up @@ -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.
Expand Down
Loading

0 comments on commit 4b903e3

Please sign in to comment.