[PATCH][2.6] Move Sungem to gige menu

[PATCH][2.6] Move Sungem to gige menu

[Zwane Mwaikambo]

Move Sun GEM driver option to the gigabit ethernet section.

Signed-off-by: Zwane Mwaikambo <zwane@fsmlabs.com>

Index: linux-2.6.8/drivers/net/Kconfig
===================================================================
RCS file: /home/cvsroot/linux-2.6.8/drivers/net/Kconfig,v
retrieving revision 1.1.1.1
diff -u -p -B -r1.1.1.1 Kconfig
--- linux-2.6.8/drivers/net/Kconfig	14 Aug 2004 17:53:39 -0000	1.1.1.1
+++ linux-2.6.8/drivers/net/Kconfig	14 Aug 2004 18:12:05 -0000
@@ -562,14 +562,6 @@ config SUNQE
 	  To compile this driver as a module, choose M here: the module
 	  will be called sunqe.

-config SUNGEM
-	tristate "Sun GEM support"
-	depends on NET_ETHERNET && PCI
-	select CRC32
-	help
-	  Support for the Sun GEM chip, aka Sun GigabitEthernet/P 2.0.  See also
-	  <http://www.sun.com/products-n-solutions/hardware/docs/pdf/806-3985-10.pdf>.
-
 config NET_VENDOR_3COM
 	bool "3COM cards"
 	depends on NET_ETHERNET && (ISA || EISA || MCA || PCI)
@@ -2131,6 +2123,13 @@ config TIGON3
 	  To compile this driver as a module, choose M here: the module
 	  will be called tg3.  This is recommended.

+config SUNGEM
+	tristate "Sun GEM support"
+	depends on NET_ETHERNET && PCI
+	select CRC32
+	help
+	  Support for the Sun GEM chip, aka Sun GigabitEthernet/P 2.0.  See also
+	  <http://www.sun.com/products-n-solutions/hardware/docs/pdf/806-3985-10.pdf>.
 endmenu

 #

Re: [PATCH][2.6] Move Sungem to gige menu

[Christoph Hellwig]

On Sat, Aug 14, 2004 at 11:04:23PM -0400, Zwane Mwaikambo wrote:
> Move Sun GEM driver option to the gigabit ethernet section.

The SunGEM on my ibook only supports 10/100Mbit

Re: [PATCH][2.6] Move Sungem to gige menu

[Zwane Mwaikambo]

On Sun, 15 Aug 2004, Christoph Hellwig wrote:

> On Sat, Aug 14, 2004 at 11:04:23PM -0400, Zwane Mwaikambo wrote:
> > Move Sun GEM driver option to the gigabit ethernet section.
>
> The SunGEM on my ibook only supports 10/100Mbit

Thanks, i'm an idiot.

Re: [PATCH][2.6] Move Sungem to gige menu

[Zwane Mwaikambo]

On Sun, 15 Aug 2004, Zwane Mwaikambo wrote:

> On Sun, 15 Aug 2004, Christoph Hellwig wrote:
>
> > On Sat, Aug 14, 2004 at 11:04:23PM -0400, Zwane Mwaikambo wrote:
> > > Move Sun GEM driver option to the gigabit ethernet section.
> >
> > The SunGEM on my ibook only supports 10/100Mbit
>
> Thanks, i'm an idiot.

The confusion came about when i was searching for the GigE NIC driver for
the G5

Re: [PATCH][2.6] Move Sungem to gige menu

[Christoph Hellwig]

On Sun, Aug 15, 2004 at 11:17:25AM -0400, Zwane Mwaikambo wrote:
> The confusion came about when i was searching for the GigE NIC driver for
> the G5

I think that can only mean we should get rid of that confusing menu ASAP.

Re: [PATCH][2.6] Move Sungem to gige menu

[Benjamin Herrenschmidt]

On Mon, 2004-08-16 at 01:21, Christoph Hellwig wrote:
> On Sun, Aug 15, 2004 at 11:17:25AM -0400, Zwane Mwaikambo wrote:
> > The confusion came about when i was searching for the GigE NIC driver for
> > the G5
> 
> I think that can only mean we should get rid of that confusing menu ASAP.

Heh, agreed.

In the case of sungem, it depends on the PHY connected to it, it's
gigabit on desktops & high end laptops, and 10/100 on ibooks and most
imacs. I suppose the ones used by Sun are all gigabit tho.

Ben.

Re: [PATCH][2.6] Move Sungem to gige menu

[David S. Miller]

On Mon, 16 Aug 2004 08:26:53 +1000
Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote:

> I suppose the ones used by Sun are all gigabit tho.

Actually no, the ones onboard in the SunBlade100 are
10/100 only.

Re: [PATCH][2.6] Move Sungem to gige menu

[Zwane Mwaikambo]

On Sun, 15 Aug 2004, David S. Miller wrote:

> On Mon, 16 Aug 2004 08:26:53 +1000
> Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote:
>
> > I suppose the ones used by Sun are all gigabit tho.
>
> Actually no, the ones onboard in the SunBlade100 are
> 10/100 only.

How about;

Index: linux-2.6.8/drivers/net/Kconfig
===================================================================
RCS file: /home/cvsroot/linux-2.6.8/drivers/net/Kconfig,v
retrieving revision 1.1.1.1
diff -u -p -B -r1.1.1.1 Kconfig
--- linux-2.6.8/drivers/net/Kconfig	14 Aug 2004 17:53:39 -0000	1.1.1.1
+++ linux-2.6.8/drivers/net/Kconfig	16 Aug 2004 04:53:44 -0000
@@ -159,11 +159,11 @@ endif
 #	Ethernet
 #

-menu "Ethernet (10 or 100Mbit)"
+menu "Ethernet (10/100/1000Mbit)"
 	depends on NETDEVICES

 config NET_ETHERNET
-	bool "Ethernet (10 or 100Mbit)"
+	bool "Ethernet (10/100/1000Mbit)"
 	---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.
@@ -1878,15 +1878,6 @@ config NE_H8300

 source "drivers/net/fec_8xx/Kconfig"

-endmenu
-
-#
-#	Gigabit Ethernet
-#
-
-menu "Ethernet (1000 Mbit)"
-	depends on NETDEVICES
-
 config ACENIC
 	tristate "Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support"
 	depends on PCI