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>

diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig
index 9f194a0bef7ca2eb60bd05a7a9ef90d0243e6113..37eed4d84e9cb458b2ac5d3b7248b0835115c67a 100644 (file)
--- 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 b2137e8f7ca63dbd4b2d7b88e3c19ea5153d327f..16604bdf5197ea81031484c2d3deefa5d0aae020 100644 (file)
--- 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