diff options
| author | David S. Miller <davem@davemloft.net> | 2014-01-01 22:54:40 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-01 22:54:40 -0500 |
| commit | 4b903e30bb24db592f3d52b9dd80744c3556705c (patch) | |
| tree | 62e0e1cda157923e01d3f4d817f6e5568579deae /drivers/net/usb/cdc_ether.c | |
| parent | 63d515c3192882bc41394a34246e5de247574054 (diff) | |
| parent | 43779f8dfb0051b2ecd5f17ea7ad089443278e82 (diff) | |
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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb/cdc_ether.c')
| -rw-r--r-- | drivers/net/usb/cdc_ether.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c index 4b1c0f3f727..640406ac435 100644 --- a/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c @@ -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. |