Skip to contentSkip to conversation

let USB_{PEGASUS,USBNET} depend on NET_ETHERNET

PATCH In review Adrian Bunk 4 participants 4 messages Dec 21, 2003 – Dec 29, 2003 USB

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 let USB_{PEGASUS,USBNET} depend on NET_ETHERNET

I observed the following small problem in 2.6:

- MII depends on NET_ETHERNET
- USB_PEGASUS and USB_USBNET select MII, but they depend only on NET

The patch below lets USB_PEGASUS and USB_USBNET depend on NET_ETHERNET instead of NET to fix this issue.

Please apply
Adrian

drivers/usb/net/Kconfig renamed from drivers/usb/net/Kconfig.old +2 -2
@@ -69,7 +69,7 @@
 
 config USB_PEGASUS
 	tristate "USB Pegasus/Pegasus-II based ethernet device support"
-	depends on USB && NET
+	depends on USB && NET_ETHERNET
 	select MII
 	---help---
 	  Say Y here if you know you have Pegasus or Pegasus-II based adapter.
@@ -95,7 +95,7 @@
 
 config USB_USBNET
 	tristate "Multi-purpose USB Networking Framework"
-	depends on USB && NET
+	depends on USB && NET_ETHERNET
 	select CRC32
 	select MII
 	---help---
#1 lore raw
Quoted 6 lines · Adrian Bunk

I observed the following small problem in 2.6:

- MII depends on NET_ETHERNET
- USB_PEGASUS and USB_USBNET select MII, but they depend only on NET

The patch below lets USB_PEGASUS and USB_USBNET depend on NET_ETHERNET instead of NET to fix this issue.

Look OK to me. I'll let GregKH apply...

#2 lore raw
In reply to Adrian Bunk
Quoted 6 lines · Adrian Bunk

I observed the following small problem in 2.6:

- MII depends on NET_ETHERNET
- USB_PEGASUS and USB_USBNET select MII, but they depend only on NET

The patch below lets USB_PEGASUS and USB_USBNET depend on NET_ETHERNET instead of NET to fix this issue.

Actually how about this one instead? The PEGASUS bit is the same. The difference is that MII (and CRC32) are only attributed to the driver code that needs those ... AX8817X needs both, ZAURUS just needs CRC32. The core (which should eventually become a separate module) shouldn't depend on those modules at all.

Also both CDCETHER and AX8817X are marked as non-experimental; I recall Dave Hollis submitted a patch to do that for AX8817X, and CDCETHER now seems to have gotten enough success reports too.

- Dave

drivers/usb/net/Kconfig +6 -7
@@ -69,7 +69,7 @@
 
 config USB_PEGASUS
 	tristate "USB Pegasus/Pegasus-II based ethernet device support"
-	depends on USB && NET
+	depends on USB && NET_ETHERNET
 	select MII
 	---help---
 	  Say Y here if you know you have Pegasus or Pegasus-II based adapter.
@@ -96,8 +96,6 @@
 config USB_USBNET
 	tristate "Multi-purpose USB Networking Framework"
 	depends on USB && NET
-	select CRC32
-	select MII
 	---help---
 	  This driver supports several kinds of network links over USB,
 	  with "minidrivers" built around a common network driver core
@@ -206,6 +204,7 @@
 config USB_ZAURUS
 	boolean "Sharp Zaurus (stock ROMs)"
 	depends on USB_USBNET
+	select CRC32
 	default y
 	help
 	  Choose this option to support the usb networking links used by
@@ -217,9 +216,7 @@
 
 config USB_CDCETHER
 	boolean "CDC Ethernet support (smart devices such as cable modems)"
-	# experimental primarily because cdc-ether was.
-	# make it non-experimental after more interop testing
-	depends on USB_USBNET && EXPERIMENTAL
+	depends on USB_USBNET
 	default y
 	help
 	  This option supports devices conforming to the Communication Device
@@ -247,7 +244,9 @@
 
 config USB_AX8817X
 	boolean "ASIX AX88172 Based USB 2.0 Ethernet Devices"
-	depends on USB_USBNET && EXPERIMENTAL
+	depends on USB_USBNET && NET_ETHERNET
+	select CRC32
+	select MII
 	default y
 	help
 
#3 lore raw
Quoted 15 lines · David Brownell
Quoted 7 lines · Adrian Bunk

I observed the following small problem in 2.6:

- MII depends on NET_ETHERNET
- USB_PEGASUS and USB_USBNET select MII, but they depend only on NET

The patch below lets USB_PEGASUS and USB_USBNET depend on NET_ETHERNET instead of NET to fix this issue.

Actually how about this one instead? The PEGASUS bit is the same. The difference is that MII (and CRC32) are only attributed to the driver code that needs those ... AX8817X needs both, ZAURUS just needs CRC32. The core (which should eventually become a separate module) shouldn't depend on those modules at all.

Quoted 3 lines

Also both CDCETHER and AX8817X are marked as non-experimental; I recall Dave Hollis submitted a patch to do that for AX8817X, and CDCETHER now seems to have gotten enough success reports too.

Thanks, I've merged this by hand and applied it to my trees.

greg k-h