[2.6 patch] let USB_{PEGASUS,USBNET} depend on NET_ETHERNET

[2.6 patch] let USB_{PEGASUS,USBNET} depend on NET_ETHERNET

[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.

Please apply
Adrian

--- linux-2.6.0-test11-mm1-modular-no-smp/drivers/usb/net/Kconfig.old	2003-12-21 03:18:32.000000000 +0100
+++ linux-2.6.0-test11-mm1-modular-no-smp/drivers/usb/net/Kconfig	2003-12-21 03:18:55.000000000 +0100
@@ -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---

Re: [2.6 patch] let USB_{PEGASUS,USBNET} depend on NET_ETHERNET

[Jeff Garzik]

Adrian Bunk wrote:
> 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...

Re: [2.6 patch] let USB_{PEGASUS,USBNET} depend on NET_ETHERNET

[David Brownell]

[-- Attachment #1: Type: text/plain, Size: 805 bytes --]

Adrian Bunk wrote:
> 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


[-- Attachment #2: kconf.patch --]
[-- Type: text/plain, Size: 1468 bytes --]

--- 1.12/drivers/usb/net/Kconfig	Sat Sep 27 03:23:06 2003
+++ edited/drivers/usb/net/Kconfig	Sun Dec 21 15:24:41 2003
@@ -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
 

Re: [2.6 patch] let USB_{PEGASUS,USBNET} depend on NET_ETHERNET

[Greg KH]

On Sun, Dec 21, 2003 at 03:46:31PM -0800, David Brownell wrote:
> Adrian Bunk wrote:
> >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.

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

greg k-h