evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'r8152'

Browse source 
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>
This commit is contained in:
David S. Miller 2014-01-01 22:54:40 -05:00
commit 4b903e30bb
3 changed files with 743 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/net/usb/cdc_ether.c
View file

@ -486,6 +486,7 @@ static const struct driver_info wwan_info = {
#define ZTE_VENDOR_ID 0x19D2 #define ZTE_VENDOR_ID 0x19D2
#define DELL_VENDOR_ID 0x413C #define DELL_VENDOR_ID 0x413C
#define REALTEK_VENDOR_ID 0x0bda #define REALTEK_VENDOR_ID 0x0bda
#define SAMSUNG_VENDOR_ID 0x04e8
static const struct usb_device_id products[] = { static const struct usb_device_id products[] = {
/* BLACKLIST !! /* BLACKLIST !!
@ -652,6 +653,15 @@ static const struct usb_device_id products[] = {
.driver_info = 0, .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!!! /* WHITELIST!!!
* *
* CDC Ether uses two interfaces, not necessarily consecutive. * CDC Ether uses two interfaces, not necessarily consecutive.

815
drivers/net/usb/r8152.c
View file

File diff suppressed because it is too large Load diff

2
drivers/net/usb/r815x.c
View file

@ -226,7 +226,7 @@ static const struct usb_device_id products[] = {
{ {
USB_DEVICE_AND_INTERFACE_INFO(REALTEK_VENDOR_ID, 0x8153, USB_CLASS_COMM, USB_DEVICE_AND_INTERFACE_INFO(REALTEK_VENDOR_ID, 0x8153, USB_CLASS_COMM,
USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE), 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, .driver_info = 0,
#else #else
.driver_info = (unsigned long) &r8153_info, .driver_info = (unsigned long) &r8153_info,