summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Romieu <romieu@fr.zoreil.com>2014-08-07 00:36:40 +0200
committerDavid S. Miller <davem@davemloft.net>2014-08-06 16:00:20 -0700
commit269f8cb2608c7bdebadeb9a2061ba42dcd6d4ff7 (patch)
treeb6ac8d7914e934840059b0d1fdf64a030e278619
parent753a2ad54ef45e3417a9d49537c2b42b04a2e1be (diff)
downloadlinux-269f8cb2608c7bdebadeb9a2061ba42dcd6d4ff7.tar.gz
linux-269f8cb2608c7bdebadeb9a2061ba42dcd6d4ff7.tar.bz2
linux-269f8cb2608c7bdebadeb9a2061ba42dcd6d4ff7.zip
net: fix USB network driver config option.
It must be tristate to avoid broken dependencies with kernel built-in usb network drivers when usb support is module only. When net config option is set, least surprize default should match usb. Wireless RNDIS USB driver used to select USB_USBNET. USB_USBNET now depends on USB_NET_DRIVERS so the latter should be selected as well. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/usb/Kconfig4
-rw-r--r--drivers/net/wireless/Kconfig1
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig
index 9f194a0bef7c..37eed4d84e9c 100644
--- a/drivers/net/usb/Kconfig
+++ b/drivers/net/usb/Kconfig
@@ -5,8 +5,8 @@ comment "Host-side USB support is needed for USB Network Adapter support"
depends on !USB && NET
menuconfig USB_NET_DRIVERS
- bool "USB Network Adapters"
- default y
+ tristate "USB Network Adapters"
+ default USB if USB
depends on USB && NET
if USB_NET_DRIVERS
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index b2137e8f7ca6..16604bdf5197 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -189,6 +189,7 @@ config USB_NET_RNDIS_WLAN
tristate "Wireless RNDIS USB support"
depends on USB
depends on CFG80211
+ select USB_NET_DRIVERS
select USB_USBNET
select USB_NET_CDCETHER
select USB_NET_RNDIS_HOST