Commit 4606bd17 authored by David Brownell's avatar David Brownell Committed by Greg Kroah-Hartman

[PATCH] USB: let USB_{PEGASUS,USBNET} depend on NET_ETHERNET

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.
parent 3b99c1c4
...@@ -69,7 +69,7 @@ config USB_KAWETH ...@@ -69,7 +69,7 @@ config USB_KAWETH
config USB_PEGASUS config USB_PEGASUS
tristate "USB Pegasus/Pegasus-II based ethernet device support" tristate "USB Pegasus/Pegasus-II based ethernet device support"
depends on USB && NET depends on USB && NET_ETHERNET
select MII select MII
---help--- ---help---
Say Y here if you know you have Pegasus or Pegasus-II based adapter. Say Y here if you know you have Pegasus or Pegasus-II based adapter.
...@@ -96,8 +96,6 @@ config USB_RTL8150 ...@@ -96,8 +96,6 @@ config USB_RTL8150
config USB_USBNET config USB_USBNET
tristate "Multi-purpose USB Networking Framework" tristate "Multi-purpose USB Networking Framework"
depends on USB && NET depends on USB && NET
select CRC32
select MII
---help--- ---help---
This driver supports several kinds of network links over USB, This driver supports several kinds of network links over USB,
with "minidrivers" built around a common network driver core with "minidrivers" built around a common network driver core
...@@ -206,6 +204,7 @@ config USB_EPSON2888 ...@@ -206,6 +204,7 @@ config USB_EPSON2888
config USB_ZAURUS config USB_ZAURUS
boolean "Sharp Zaurus (stock ROMs)" boolean "Sharp Zaurus (stock ROMs)"
depends on USB_USBNET depends on USB_USBNET
select CRC32
default y default y
help help
Choose this option to support the usb networking links used by Choose this option to support the usb networking links used by
...@@ -217,9 +216,7 @@ config USB_ZAURUS ...@@ -217,9 +216,7 @@ config USB_ZAURUS
config USB_CDCETHER config USB_CDCETHER
boolean "CDC Ethernet support (smart devices such as cable modems)" boolean "CDC Ethernet support (smart devices such as cable modems)"
# experimental primarily because cdc-ether was. depends on USB_USBNET
# make it non-experimental after more interop testing
depends on USB_USBNET && EXPERIMENTAL
default y default y
help help
This option supports devices conforming to the Communication Device This option supports devices conforming to the Communication Device
...@@ -247,7 +244,9 @@ comment "USB Network Adapters" ...@@ -247,7 +244,9 @@ comment "USB Network Adapters"
config USB_AX8817X config USB_AX8817X
boolean "ASIX AX88172 Based USB 2.0 Ethernet Devices" boolean "ASIX AX88172 Based USB 2.0 Ethernet Devices"
depends on USB_USBNET depends on USB_USBNET && NET_ETHERNET
select CRC32
select MII
default y default y
help help
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment