netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH/RFC] make MII and PHYLIB independent of NET_ETHERNET
@ 2006-11-20  4:22 Randy Dunlap
  2006-11-30 11:10 ` Jeff Garzik
  0 siblings, 1 reply; 5+ messages in thread
From: Randy Dunlap @ 2006-11-20  4:22 UTC (permalink / raw)
  To: netdev; +Cc: jgarzik

From: Randy Dunlap <randy.dunlap@oracle.com>

PHYLIB can be used by non-NET_ETHERNET (10/100 ethernet) devices;
e.g., GIANFAR (gigabit) uses it.

We also have USB ethernet devices trying to use MII
without NET_ETHERNET being enabled, so move MII outside of
NET_ETHERNET, along with PHYLIB.

They both still depend on NET && NETDEVICES.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
 drivers/net/Kconfig     |   15 +++++++--------
 drivers/net/phy/Kconfig |   19 +++++--------------
 2 files changed, 12 insertions(+), 22 deletions(-)

--- linux-2619-rc6g2.orig/drivers/net/Kconfig
+++ linux-2619-rc6g2/drivers/net/Kconfig
@@ -145,6 +145,13 @@ config NET_SB1000
 
 source "drivers/net/arcnet/Kconfig"
 
+config MII
+	tristate "Generic Media Independent Interface device support"
+	help
+	  Most ethernet controllers have MII transceiver either as an external
+	  or internal device.  It is safe to say Y or M here even if your
+	  ethernet card lack MII.
+
 source "drivers/net/phy/Kconfig"
 
 #
@@ -180,14 +187,6 @@ config NET_ETHERNET
 	  kernel: saying N will just cause the configurator to skip all
 	  the questions about Ethernet network cards. If unsure, say N.
 
-config MII
-	tristate "Generic Media Independent Interface device support"
-	depends on NET_ETHERNET
-	help
-	  Most ethernet controllers have MII transceiver either as an external
-	  or internal device.  It is safe to say Y or M here even if your
-	  ethernet card lack MII.
-
 source "drivers/net/arm/Kconfig"
 
 config MACE
--- linux-2619-rc6g2.orig/drivers/net/phy/Kconfig
+++ linux-2619-rc6g2/drivers/net/phy/Kconfig
@@ -2,63 +2,54 @@
 # PHY Layer Configuration
 #
 
-menu "PHY device support"
-
-config PHYLIB
+menuconfig PHYLIB
 	tristate "PHY Device support and infrastructure"
-	depends on NET_ETHERNET && (BROKEN || !S390)
+	depends on (BROKEN || !S390)
 	help
 	  Ethernet controllers are usually attached to PHY
 	  devices.  This option provides infrastructure for
 	  managing PHY devices.
 
+if PHYLIB
+
 comment "MII PHY device drivers"
-	depends on PHYLIB
 
 config MARVELL_PHY
 	tristate "Drivers for Marvell PHYs"
-	depends on PHYLIB
 	---help---
 	  Currently has a driver for the 88E1011S
 	
 config DAVICOM_PHY
 	tristate "Drivers for Davicom PHYs"
-	depends on PHYLIB
 	---help---
 	  Currently supports dm9161e and dm9131
 
 config QSEMI_PHY
 	tristate "Drivers for Quality Semiconductor PHYs"
-	depends on PHYLIB
 	---help---
 	  Currently supports the qs6612
 
 config LXT_PHY
 	tristate "Drivers for the Intel LXT PHYs"
-	depends on PHYLIB
 	---help---
 	  Currently supports the lxt970, lxt971
 
 config CICADA_PHY
 	tristate "Drivers for the Cicada PHYs"
-	depends on PHYLIB
 	---help---
 	  Currently supports the cis8204
 config VITESSE_PHY
         tristate "Drivers for the Vitesse PHYs"
-        depends on PHYLIB
         ---help---
           Currently supports the vsc8244
 
 config SMSC_PHY
 	tristate "Drivers for SMSC PHYs"
-	depends on PHYLIB
 	---help---
 	  Currently supports the LAN83C185 PHY
 
 config FIXED_PHY
 	tristate "Drivers for PHY emulation on fixed speed/link"
-	depends on PHYLIB
 	---help---
 	  Adds the driver to PHY layer to cover the boards that do not have any PHY bound,
 	  but with the ability to manipulate with speed/link in software. The relavant MII
@@ -73,5 +64,5 @@ config FIXED_MII_100_FDX
 	bool "Emulation for 100M Fdx fixed PHY behavior"
 	depends on FIXED_PHY
 
-endmenu
+endif #PHYLIB
 


---

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH/RFC] make MII and PHYLIB independent of NET_ETHERNET
  2006-11-20  4:22 [PATCH/RFC] make MII and PHYLIB independent of NET_ETHERNET Randy Dunlap
@ 2006-11-30 11:10 ` Jeff Garzik
  2006-12-02 23:43   ` Randy Dunlap
  0 siblings, 1 reply; 5+ messages in thread
From: Jeff Garzik @ 2006-11-30 11:10 UTC (permalink / raw)
  To: Randy Dunlap; +Cc: netdev

ACK, but patch doesn't apply to #upstream


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH/RFC] make MII and PHYLIB independent of NET_ETHERNET
  2006-11-30 11:10 ` Jeff Garzik
@ 2006-12-02 23:43   ` Randy Dunlap
  2006-12-07  9:58     ` Jeff Garzik
  0 siblings, 1 reply; 5+ messages in thread
From: Randy Dunlap @ 2006-12-02 23:43 UTC (permalink / raw)
  To: Jeff Garzik; +Cc: netdev

On Thu, 30 Nov 2006 06:10:14 -0500 Jeff Garzik wrote:

> ACK, but patch doesn't apply to #upstream

Does it work to patch -mm instead?  (below)

---
From: Randy Dunlap <randy.dunlap@oracle.com>

PHYLIB can be used by non-NET_ETHERNET (10/100 ethernet) devices;
e.g., GIANFAR (gigabit) uses it.

We also have USB ethernet devices trying to use MII
without NET_ETHERNET being enabled, so move MII outside of
NET_ETHERNET, along with PHYLIB.

They both still depend on NET && NETDEVICES.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
 drivers/net/Kconfig     |   16 ++++++++--------
 drivers/net/phy/Kconfig |   21 +++++----------------
 2 files changed, 13 insertions(+), 24 deletions(-)

--- linux-2.6.19-rc6-mm2.orig/drivers/net/Kconfig
+++ linux-2.6.19-rc6-mm2/drivers/net/Kconfig
@@ -145,6 +145,14 @@ config NET_SB1000
 
 source "drivers/net/arcnet/Kconfig"
 
+config MII
+	tristate "Generic Media Independent Interface device support"
+	depends on NET_ETHERNET
+	help
+	  Most ethernet controllers have MII transceiver either as an external
+	  or internal device.  It is safe to say Y or M here even if your
+	  ethernet card lack MII.
+
 source "drivers/net/phy/Kconfig"
 
 #
@@ -180,14 +188,6 @@ config NET_ETHERNET
 	  kernel: saying N will just cause the configurator to skip all
 	  the questions about Ethernet network cards. If unsure, say N.
 
-config MII
-	tristate "Generic Media Independent Interface device support"
-	depends on NET_ETHERNET
-	help
-	  Most ethernet controllers have MII transceiver either as an external
-	  or internal device.  It is safe to say Y or M here even if your
-	  ethernet card lack MII.
-
 config MACB
 	tristate "Atmel MACB support"
 	depends on NET_ETHERNET && AVR32
--- linux-2.6.19-rc6-mm2.orig/drivers/net/phy/Kconfig
+++ linux-2.6.19-rc6-mm2/drivers/net/phy/Kconfig
@@ -2,69 +2,59 @@
 # PHY Layer Configuration
 #
 
-menu "PHY device support"
-
-config PHYLIB
+menuconfig PHYLIB
 	tristate "PHY Device support and infrastructure"
-	depends on NET_ETHERNET && (BROKEN || !S390)
+	depends on (BROKEN || !S390)
 	help
 	  Ethernet controllers are usually attached to PHY
 	  devices.  This option provides infrastructure for
 	  managing PHY devices.
 
+if PHYLIB
+
 comment "MII PHY device drivers"
-	depends on PHYLIB
 
 config MARVELL_PHY
 	tristate "Drivers for Marvell PHYs"
-	depends on PHYLIB
 	---help---
 	  Currently has a driver for the 88E1011S
 	
 config DAVICOM_PHY
 	tristate "Drivers for Davicom PHYs"
-	depends on PHYLIB
 	---help---
 	  Currently supports dm9161e and dm9131
 
 config QSEMI_PHY
 	tristate "Drivers for Quality Semiconductor PHYs"
-	depends on PHYLIB
 	---help---
 	  Currently supports the qs6612
 
 config LXT_PHY
 	tristate "Drivers for the Intel LXT PHYs"
-	depends on PHYLIB
 	---help---
 	  Currently supports the lxt970, lxt971
 
 config CICADA_PHY
 	tristate "Drivers for the Cicada PHYs"
-	depends on PHYLIB
 	---help---
 	  Currently supports the cis8204
 config VITESSE_PHY
         tristate "Drivers for the Vitesse PHYs"
-        depends on PHYLIB
         ---help---
           Currently supports the vsc8244
 
 config SMSC_PHY
 	tristate "Drivers for SMSC PHYs"
-	depends on PHYLIB
 	---help---
 	  Currently supports the LAN83C185 PHY
 
 config BROADCOM_PHY
 	tristate "Drivers for Broadcom PHYs"
-	depends on PHYLIB
 	---help---
 	  Currently supports the BCM5411, BCM5421 and BCM5461 PHYs.
 
 config FIXED_PHY
 	tristate "Drivers for PHY emulation on fixed speed/link"
-	depends on PHYLIB
 	---help---
 	  Adds the driver to PHY layer to cover the boards that do not have any PHY bound,
 	  but with the ability to manipulate with speed/link in software. The relavant MII
@@ -79,5 +69,4 @@ config FIXED_MII_100_FDX
 	bool "Emulation for 100M Fdx fixed PHY behavior"
 	depends on FIXED_PHY
 
-endmenu
-
+endif #PHYLIB

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH/RFC] make MII and PHYLIB independent of NET_ETHERNET
  2006-12-02 23:43   ` Randy Dunlap
@ 2006-12-07  9:58     ` Jeff Garzik
  2006-12-07 22:50       ` Randy Dunlap
  0 siblings, 1 reply; 5+ messages in thread
From: Jeff Garzik @ 2006-12-07  9:58 UTC (permalink / raw)
  To: Randy Dunlap; +Cc: netdev

Randy Dunlap wrote:
> On Thu, 30 Nov 2006 06:10:14 -0500 Jeff Garzik wrote:
> 
>> ACK, but patch doesn't apply to #upstream
> 
> Does it work to patch -mm instead?  (below)
> 
> ---
> From: Randy Dunlap <randy.dunlap@oracle.com>
> 
> PHYLIB can be used by non-NET_ETHERNET (10/100 ethernet) devices;
> e.g., GIANFAR (gigabit) uses it.
> 
> We also have USB ethernet devices trying to use MII
> without NET_ETHERNET being enabled, so move MII outside of
> NET_ETHERNET, along with PHYLIB.
> 
> They both still depend on NET && NETDEVICES.
> 
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>

still didn't apply



^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH/RFC] make MII and PHYLIB independent of NET_ETHERNET
  2006-12-07  9:58     ` Jeff Garzik
@ 2006-12-07 22:50       ` Randy Dunlap
  0 siblings, 0 replies; 5+ messages in thread
From: Randy Dunlap @ 2006-12-07 22:50 UTC (permalink / raw)
  To: Jeff Garzik; +Cc: netdev

> still didn't apply

---
From: Randy Dunlap <randy.dunlap@oracle.com>

PHYLIB can be used by non-NET_ETHERNET (10/100 ethernet) devices;
e.g., GIANFAR (gigabit) uses it.

We also have USB ethernet devices trying to use MII
without NET_ETHERNET being enabled, so move MII outside of
NET_ETHERNET, along with PHYLIB.

They both still depend on NET && NETDEVICES.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
 drivers/net/Kconfig     |   16 ++++++++--------
 drivers/net/phy/Kconfig |   21 +++++----------------
 2 files changed, 13 insertions(+), 24 deletions(-)

--- netdev-ups.orig/drivers/net/Kconfig
+++ netdev-ups/drivers/net/Kconfig
@@ -145,6 +145,14 @@ config NET_SB1000
 
 source "drivers/net/arcnet/Kconfig"
 
+config MII
+	tristate "Generic Media Independent Interface device support"
+	depends on NET_ETHERNET
+	help
+	  Most ethernet controllers have MII transceiver either as an external
+	  or internal device.  It is safe to say Y or M here even if your
+	  ethernet card lack MII.
+
 source "drivers/net/phy/Kconfig"
 
 #
@@ -180,14 +188,6 @@ config NET_ETHERNET
 	  kernel: saying N will just cause the configurator to skip all
 	  the questions about Ethernet network cards. If unsure, say N.
 
-config MII
-	tristate "Generic Media Independent Interface device support"
-	depends on NET_ETHERNET
-	help
-	  Most ethernet controllers have MII transceiver either as an external
-	  or internal device.  It is safe to say Y or M here even if your
-	  ethernet card lack MII.
-
 config MACB
 	tristate "Atmel MACB support"
 	depends on NET_ETHERNET && AVR32
--- netdev-ups.orig/drivers/net/phy/Kconfig
+++ netdev-ups/drivers/net/phy/Kconfig
@@ -2,69 +2,59 @@
 # PHY Layer Configuration
 #
 
-menu "PHY device support"
-
-config PHYLIB
+menuconfig PHYLIB
 	tristate "PHY Device support and infrastructure"
-	depends on NET_ETHERNET && (BROKEN || !S390)
+	depends on (BROKEN || !S390)
 	help
 	  Ethernet controllers are usually attached to PHY
 	  devices.  This option provides infrastructure for
 	  managing PHY devices.
 
+if PHYLIB
+
 comment "MII PHY device drivers"
-	depends on PHYLIB
 
 config MARVELL_PHY
 	tristate "Drivers for Marvell PHYs"
-	depends on PHYLIB
 	---help---
 	  Currently has a driver for the 88E1011S
 	
 config DAVICOM_PHY
 	tristate "Drivers for Davicom PHYs"
-	depends on PHYLIB
 	---help---
 	  Currently supports dm9161e and dm9131
 
 config QSEMI_PHY
 	tristate "Drivers for Quality Semiconductor PHYs"
-	depends on PHYLIB
 	---help---
 	  Currently supports the qs6612
 
 config LXT_PHY
 	tristate "Drivers for the Intel LXT PHYs"
-	depends on PHYLIB
 	---help---
 	  Currently supports the lxt970, lxt971
 
 config CICADA_PHY
 	tristate "Drivers for the Cicada PHYs"
-	depends on PHYLIB
 	---help---
 	  Currently supports the cis8204
 config VITESSE_PHY
         tristate "Drivers for the Vitesse PHYs"
-        depends on PHYLIB
         ---help---
           Currently supports the vsc8244
 
 config SMSC_PHY
 	tristate "Drivers for SMSC PHYs"
-	depends on PHYLIB
 	---help---
 	  Currently supports the LAN83C185 PHY
 
 config BROADCOM_PHY
 	tristate "Drivers for Broadcom PHYs"
-	depends on PHYLIB
 	---help---
 	  Currently supports the BCM5411, BCM5421 and BCM5461 PHYs.
 
 config FIXED_PHY
 	tristate "Drivers for PHY emulation on fixed speed/link"
-	depends on PHYLIB
 	---help---
 	  Adds the driver to PHY layer to cover the boards that do not have any PHY bound,
 	  but with the ability to manipulate the speed/link in software. The relevant MII
@@ -79,5 +69,4 @@ config FIXED_MII_100_FDX
 	bool "Emulation for 100M Fdx fixed PHY behavior"
 	depends on FIXED_PHY
 
-endmenu
-
+endif #PHYLIB

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2006-12-07 22:50 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-11-20  4:22 [PATCH/RFC] make MII and PHYLIB independent of NET_ETHERNET Randy Dunlap
2006-11-30 11:10 ` Jeff Garzik
2006-12-02 23:43   ` Randy Dunlap
2006-12-07  9:58     ` Jeff Garzik
2006-12-07 22:50       ` Randy Dunlap

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).