Hi
On 18.11.2020 07:43, 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.szyprowski@xxxxxxxxxxx>
> Signed-off-by: Hayes Wang <hayeswang@xxxxxxxxxxx>
Yes, this looks like a proper fix.
Tested-by: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx>
> ---
> v2:
> Use a separate Kconfig entry for r8153_ecm with proper dependencies.
>
> drivers/net/usb/Kconfig | 9 +++++++++
> drivers/net/usb/Makefile | 3 ++-
> 2 files changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig
> index b46993d5f997..1e3719028780 100644
> --- a/drivers/net/usb/Kconfig
> +++ b/drivers/net/usb/Kconfig
> @@ -628,4 +628,13 @@ config USB_NET_AQC111
> This driver should work with at least the following devices:
> * Aquantia AQtion USB to 5GbE
>
> +config USB_RTL8153_ECM
> + tristate "RTL8153 ECM support"
> + depends on USB_NET_CDCETHER && (USB_RTL8152 || USB_RTL8152=n)
> + default y
> + help
> + This option supports ECM mode for RTL8153 ethernet adapter, when
> + CONFIG_USB_RTL8152 is not set, or the RTL8153 device is not
> + supported by r8152 driver.
> +
> endif # USB_NET_DRIVERS
> diff --git a/drivers/net/usb/Makefile b/drivers/net/usb/Makefile
> index 99381e6bea78..4964f7b326fb 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,4 @@ 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
> +obj-$(CONFIG_USB_RTL8153_ECM) += r8153_ecm.o
Best regards
--
Marek Szyprowski, PhD
Samsung R&D Institute Poland
