Hi

On 16.11.2020 07:52, Hayes Wang wrote:
> Avoid r8153_ecm is compiled as built-in, if r8152 driver is compiled
> as modules. Otherwise, the r8153_ecm would be used, even though the
> device is supported by r8152 driver.
>
> Fixes: c1aedf015ebd ("net/usb/r8153_ecm: support ECM mode for RTL8153")
> Reported-by: Marek Szyprowski <m.szyprow...@samsung.com>
> Signed-off-by: Hayes Wang <hayesw...@realtek.com>

Yes, this fixes this issue, although I would prefer a separate Kconfig 
entry for r8153_ecm with proper dependencies instead of this ifdefs in 
Makefile.

Tested-by: Marek Szyprowski <m.szyprow...@samsung.com>

> ---
>   drivers/net/usb/Makefile | 10 +++++++++-
>   1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/usb/Makefile b/drivers/net/usb/Makefile
> index 99381e6bea78..98f4c100955e 100644
> --- a/drivers/net/usb/Makefile
> +++ b/drivers/net/usb/Makefile
> @@ -13,7 +13,7 @@ obj-$(CONFIG_USB_LAN78XX)   += lan78xx.o
>   obj-$(CONFIG_USB_NET_AX8817X)       += asix.o
>   asix-y := asix_devices.o asix_common.o ax88172a.o
>   obj-$(CONFIG_USB_NET_AX88179_178A)      += ax88179_178a.o
> -obj-$(CONFIG_USB_NET_CDCETHER)       += cdc_ether.o r8153_ecm.o
> +obj-$(CONFIG_USB_NET_CDCETHER)       += cdc_ether.o
>   obj-$(CONFIG_USB_NET_CDC_EEM)       += cdc_eem.o
>   obj-$(CONFIG_USB_NET_DM9601)        += dm9601.o
>   obj-$(CONFIG_USB_NET_SR9700)        += sr9700.o
> @@ -41,3 +41,11 @@ obj-$(CONFIG_USB_NET_QMI_WWAN)     += qmi_wwan.o
>   obj-$(CONFIG_USB_NET_CDC_MBIM)      += cdc_mbim.o
>   obj-$(CONFIG_USB_NET_CH9200)        += ch9200.o
>   obj-$(CONFIG_USB_NET_AQC111)        += aqc111.o
> +
> +ifdef CONFIG_USB_NET_CDCETHER
> +ifeq ($(CONFIG_USB_RTL8152), m)
> +obj-$(CONFIG_USB_RTL8152)    += r8153_ecm.o
> +else
> +obj-$(CONFIG_USB_NET_CDCETHER)       += r8153_ecm.o
> +endif
> +endif

Best regards
-- 
Marek Szyprowski, PhD
Samsung R&D Institute Poland

Reply via email to