Skip to content

Commit 657bc1d

Browse files
hayesorzkuba-moo
authored andcommitted
r8153_ecm: avoid to be prior to r8152 driver
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: c1aedf0 ("net/usb/r8153_ecm: support ECM mode for RTL8153") Reported-by: Marek Szyprowski <[email protected]> Signed-off-by: Hayes Wang <[email protected]> Tested-by: Marek Szyprowski <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent e76d795 commit 657bc1d

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

drivers/net/usb/Kconfig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -628,4 +628,13 @@ config USB_NET_AQC111
628628
This driver should work with at least the following devices:
629629
* Aquantia AQtion USB to 5GbE
630630

631+
config USB_RTL8153_ECM
632+
tristate "RTL8153 ECM support"
633+
depends on USB_NET_CDCETHER && (USB_RTL8152 || USB_RTL8152=n)
634+
default y
635+
help
636+
This option supports ECM mode for RTL8153 ethernet adapter, when
637+
CONFIG_USB_RTL8152 is not set, or the RTL8153 device is not
638+
supported by r8152 driver.
639+
631640
endif # USB_NET_DRIVERS

drivers/net/usb/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ obj-$(CONFIG_USB_LAN78XX) += lan78xx.o
1313
obj-$(CONFIG_USB_NET_AX8817X) += asix.o
1414
asix-y := asix_devices.o asix_common.o ax88172a.o
1515
obj-$(CONFIG_USB_NET_AX88179_178A) += ax88179_178a.o
16-
obj-$(CONFIG_USB_NET_CDCETHER) += cdc_ether.o r8153_ecm.o
16+
obj-$(CONFIG_USB_NET_CDCETHER) += cdc_ether.o
1717
obj-$(CONFIG_USB_NET_CDC_EEM) += cdc_eem.o
1818
obj-$(CONFIG_USB_NET_DM9601) += dm9601.o
1919
obj-$(CONFIG_USB_NET_SR9700) += sr9700.o
@@ -41,3 +41,4 @@ obj-$(CONFIG_USB_NET_QMI_WWAN) += qmi_wwan.o
4141
obj-$(CONFIG_USB_NET_CDC_MBIM) += cdc_mbim.o
4242
obj-$(CONFIG_USB_NET_CH9200) += ch9200.o
4343
obj-$(CONFIG_USB_NET_AQC111) += aqc111.o
44+
obj-$(CONFIG_USB_RTL8153_ECM) += r8153_ecm.o

0 commit comments

Comments
 (0)