Re: [PATCH net-next v2 6/6] r8152: support RTL8153

[BjÃrn Mork]

Hayes Wang <hayeswang@xxxxxxxxxxx> writes:

> Support new chip RTL8153 which is the USB 3.0 giga ethernet adapter.
>
> Signed-off-by: Hayes Wang <hayeswang@xxxxxxxxxxx>
> ---
>  drivers/net/usb/cdc_ether.c |  10 +
>  drivers/net/usb/r8152.c     | 615 +++++++++++++++++++++++++++++++++++++++++++-
>  drivers/net/usb/r815x.c     |   2 +-
>  3 files changed, 621 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
> index 4b1c0f3..640406a 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


We don't play the if-other-driver-is-enabled for any other of the
blacklisted devices, including other devices supported by the RTL8152
driver.  Why do we need it here?



> diff --git a/drivers/net/usb/r815x.c b/drivers/net/usb/r815x.c
> index 2df2f4f..5fd2ca6 100644
> --- a/drivers/net/usb/r815x.c
> +++ b/drivers/net/usb/r815x.c
> @@ -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,

This hunk seems like a completely unrelated bugfix?  This should have
been a separate patch.


BjÃrn
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/