On Thursday 01 November 2007, Adrian Bunk wrote:
> The following combination of options is simply an unusual one:
>
> CONFIG_MII=m
> CONFIG_USB_USBNET=y
> CONFIG_USB_USBNET_MII=n
I though that had been fixed for ages ...
This should do a better job of it.
- Dave
========== CUT HERE
Simplify handling of the MII-dependent usbnet based adapters: stick
to forward dependencies, and explicitly handle the core dependency.
Signed-off-by: David Brownell <[EMAIL PROTECTED]>
---
drivers/net/usb/Kconfig | 23 ++++++++++++-----------
drivers/net/usb/usbnet.c | 9 ++++++++-
2 files changed, 20 insertions(+), 12 deletions(-)
--- a.orig/drivers/net/usb/Kconfig 2007-10-21 10:35:16.000000000 -0700
+++ a/drivers/net/usb/Kconfig 2007-11-02 11:32:15.000000000 -0700
@@ -93,13 +93,8 @@ config USB_RTL8150
To compile this driver as a module, choose M here: the
module will be called rtl8150.
-config USB_USBNET_MII
- tristate
- default n
-
config USB_USBNET
tristate "Multi-purpose USB Networking Framework"
- select MII if USB_USBNET_MII != n
---help---
This driver supports several kinds of network links over USB,
with "minidrivers" built around a common network driver core
@@ -131,11 +126,19 @@ config USB_USBNET
To compile this driver as a module, choose M here: the
module will be called usbnet.
+# usbnet core will support MII when MII is static, or both are modules
+config USB_NET_MII
+ tristate
+ depends on USB_USBNET && NET_ETHERNET && (MII = y || MII = USB_USBNET)
+ default MII
+
+comment "MII support is needed for most Ethernet adapters"
+ depends on USB_USBNET && USB_NET_MII=n
+
config USB_NET_AX8817X
tristate "ASIX AX88xxx Based USB 2.0 Ethernet Adapters"
- depends on USB_USBNET && NET_ETHERNET
+ depends on USB_USBNET && USB_NET_MII
select CRC32
- select USB_USBNET_MII
default y
help
This option adds support for ASIX AX88xxx based USB 2.0
@@ -188,9 +191,8 @@ config USB_NET_CDCETHER
config USB_NET_DM9601
tristate "Davicom DM9601 based USB 1.1 10/100 ethernet devices"
- depends on USB_USBNET
+ depends on USB_USBNET && USB_NET_MII
select CRC32
- select USB_USBNET_MII
help
This option adds support for Davicom DM9601 based USB 1.1
10/100 Ethernet adapters.
@@ -224,8 +226,7 @@ config USB_NET_PLUSB
config USB_NET_MCS7830
tristate "MosChip MCS7830 based Ethernet adapters"
- depends on USB_USBNET
- select USB_USBNET_MII
+ depends on USB_USBNET && USB_NET_MII
help
Choose this option if you're using a 10/100 Ethernet USB2
adapter based on the MosChip 7830 controller. This includes
--- a.orig/drivers/net/usb/usbnet.c 2007-10-13 15:16:10.000000000 -0700
+++ a/drivers/net/usb/usbnet.c 2007-11-02 11:39:59.000000000 -0700
@@ -682,10 +682,17 @@ done_nopm:
/* ethtool methods; minidrivers may need to add some more, but
* they'll probably want to use this base set.
*/
+#undef HAVE_MII
-#if defined(CONFIG_MII) || defined(CONFIG_MII_MODULE)
+#if defined(CONFIG_MII)
#define HAVE_MII
+#elif defined(CONFIG_MII_MODULE) && defined(MODULE)
+#define HAVE_MII
+#endif
+
+#ifdef HAVE_MII
+
int usbnet_get_settings (struct net_device *net, struct ethtool_cmd *cmd)
{
struct usbnet *dev = netdev_priv(net);
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
