From: Francois Romieu <romieu@fr.zoreil.com>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, linux-usb@vger.kernel.org,
"John W. Linville" <linville@tuxdriver.com>
Subject: [PATCH 1/1] net: fix USB network driver config option.
Date: Thu, 7 Aug 2014 00:36:40 +0200 [thread overview]
Message-ID: <20140806223640.GA24673@electric-eye.fr.zoreil.com> (raw)
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.
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
--
1.9.3
next reply other threads:[~2014-08-06 22:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-06 22:36 Francois Romieu [this message]
2014-08-06 23:00 ` [PATCH 1/1] net: fix USB network driver config option David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140806223640.GA24673@electric-eye.fr.zoreil.com \
--to=romieu@fr.zoreil.com \
--cc=davem@davemloft.net \
--cc=linux-usb@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox