diff mbox

[1/1] net: fix USB network driver config option.

Message ID 20140806223640.GA24673@electric-eye.fr.zoreil.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Francois Romieu Aug. 6, 2014, 10:36 p.m. UTC 
From: Francois Romieu <romieu@fr.zoreil.com>

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>
---
 drivers/net/usb/Kconfig      | 4 ++--
 drivers/net/wireless/Kconfig | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

It applies against plain linus 85417aef44fc58b08773117ceb1bc6ca5684e973.

Comments

David Miller Aug. 6, 2014, 11 p.m. UTC | #1 
From: Francois Romieu <romieu@fr.zoreil.com>
Date: Thu, 7 Aug 2014 00:36:40 +0200

> From: Francois Romieu <romieu@fr.zoreil.com>
> 
> 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>

Ok, applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig
index 9f194a0..37eed4d 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 b2137e8..16604bd 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