[PATCH] gadget: Fix kconfig ethernet driver selection

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



>From options USB_ETH_RNDIS and USB_ETH_EEM must be selected just
one. Selecting both or none cause driver disfunctionality.

Signed-off-by: Jiri Pinkava <jiri.pinkava@xxxxxxxx>
---
 drivers/usb/gadget/Kconfig |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index bc5123c..12a5572 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -714,10 +714,14 @@ config USB_ETH
 	  Say "y" to link the driver statically, or "m" to build a
 	  dynamically linked module called "g_ether".
 
+if USB_ETH
+choice
+	prompt "CDC Ethernet driver"
+	default USB_ETH_RNDIS
+
 config USB_ETH_RNDIS
 	bool "RNDIS support"
 	depends on USB_ETH
-	default y
 	help
 	   Microsoft Windows XP bundles the "Remote NDIS" (RNDIS) protocol,
 	   and Microsoft provides redistributable binary RNDIS drivers for
@@ -735,7 +739,6 @@ config USB_ETH_RNDIS
 config USB_ETH_EEM
        bool "Ethernet Emulation Model (EEM) support"
        depends on USB_ETH
-       default n
        help
          CDC EEM is a newer USB standard that is somewhat simpler than CDC ECM
          and therefore can be supported by more hardware.  Technically ECM and
@@ -747,6 +750,8 @@ config USB_ETH_EEM
 
          If you say "y" here, the Ethernet gadget driver will use the EEM
          protocol rather than ECM.  If unsure, say "n".
+endchoice
+endif
 
 config USB_G_NCM
 	tristate "Network Control Model (NCM) support"
-- 
1.7.4.4

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Media]     [Linux Input]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Old Linux USB Devel Archive]

  Powered by Linux