Re: [patch] Re: Gigabit Kconfig problems with yesterday's update

[Adrian Bunk]

On Sun, May 30, 2004 at 01:51:33PM -0400, Jeff Garzik wrote:

> NET_GIGE is rightly dependent on NET_ETHERNET, as it is a subset.
> 
> I wonder if the attached patch "fixes" peoples config problems :)
> 
> ===== drivers/net/Kconfig 1.74 vs edited =====
> --- 1.74/drivers/net/Kconfig	2004-05-27 16:42:40 -04:00
> +++ edited/drivers/net/Kconfig	2004-05-30 13:49:48 -04:00
> @@ -163,7 +163,7 @@
>  	depends on NETDEVICES
>  
>  config NET_ETHERNET
> -	bool "Ethernet (10 or 100Mbit)"
> +	bool "Ethernet (10/100/1000/10000 Mbit)"
>  	---help---
>  	  Ethernet (also called IEEE 802.3 or ISO 8802-2) is the most common
>  	  type of Local Area Network (LAN) in universities and companies.


This is not sufficient since it's still under the
"Ethernet (10 or 100Mbit)" menu.

What about the patch below?

cu
Adrian

--- linux-2.6.7-rc2-full/drivers/net/Kconfig.old	2004-05-30 21:29:46.000000000 +0200
+++ linux-2.6.7-rc2-full/drivers/net/Kconfig	2004-05-30 21:34:42.000000000 +0200
@@ -159,11 +159,8 @@
 #	Ethernet
 #
 
-menu "Ethernet (10 or 100Mbit)"
-	depends on NETDEVICES
-
 config NET_ETHERNET
-	bool "Ethernet (10 or 100Mbit)"
+	bool "Ethernet (10/100/1000/10000 Mbit)"
 	---help---
 	  Ethernet (also called IEEE 802.3 or ISO 8802-2) is the most common
 	  type of Local Area Network (LAN) in universities and companies.
@@ -188,6 +185,9 @@
 	  kernel: saying N will just cause the configurator to skip all
 	  the questions about Ethernet network cards. If unsure, say N.
 
+menu "Ethernet (10/100 Mbit)"
+	depends on NET_ETHERNET
+
 config MII
 	tristate "Generic Media Independent Interface device support"
 	depends on NET_ETHERNET
@@ -1875,7 +1875,7 @@
 #
 
 menu "Gigabit Ethernet (1000/10000 Mbit)"
-	depends on NETDEVICES
+	depends on NET_ETHERNET
 
 config NET_GIGE
 	bool "Gigabit Ethernet (1000/10000 Mbit) controller support"
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/