Skip to contentSkip to conversation

RFC: create drivers/net/legacy for ISA, EISA, MCA drivers

PATCH In review Paul Gortmaker 7 participants 38 messages Oct 29, 2010 – Dec 17, 2010 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover RFC: create drivers/net/legacy for ISA, EISA, MCA drivers

The drivers/net dir has a lot of files - originally there were no subdirs, but at least now subdirs are being used effectively. But the original drivers from 10+ years ago are still right there at the top. This series creates a drivers/net/legacy dir.

The initial target is things like ISA/EISA/MCA drivers, and with that alone, we can get close to 90 files out of drivers/net. Plus, by having a semi-defined description for legacy as being "drivers more than 10 years old" we'll always have a destination for drivers as they fall out of maintainership and use.

If in fact this series gets agreement, I'm figuring it makes sense to have it go in either at the beginning of a dev cycle, or at the very end -- I have no strict preference; whatever is easier for people on the whole. Since I don't expect a lot of activity in any of these drivers, hopefully it doesn't impact any one else's pending changes too significantly either way.

All the moves are 100% translation; I didn't add or change any of the driver sources at all, so I've used "-M" to format the patches for e-mail. Similarly, if you apply them and git am nags about whitespace, that comes directly from the original files.

Paul.

-----

The following changes since commit 19449bfc10d163f0024dd5ae5808e28cda32e7b4:

stmmac: enable/disable rx/tx in the core with a single write. (2010-10-28 11:47:54 -0700)

are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulg/net-2.6.git legacy-netdev

Paul Gortmaker (15):
net: introduce legacy dir to absorb 10Mbit, ISA, EISA drivers 3c501: relocate ancient 8 bit ISA driver to legacy dir
de6xx: relocate ancient parallel port eth drivers to legacy
sun3: Relocate the sun3 specific lance/83596 drivers to legacy dec netdev: relocate DIGITAL based drivers to legacy
netdev: relocate i8258x and i8259x based drivers to legacy
lance: relocate legacy 7990 based drivers to legacy
netdev: relocate toplevel 8390 based drivers to legacy dir
netdev: relocate remaining ISA 3Com cards to legacy dir
netdev: relocate more one-off drivers to the legacy dir
netdev: kill off the concept of NET_VENDOR_FOO
netdev: relocate sb1000 ISA cable modem driver to legacy
netdev: kill off NET_ISA Kconfig option
MAINTAINERS: updates for new drivers/net/legacy dir
netdev: relocate LICENSE.SRC to legacy

 MAINTAINERS                            |   19 +-
 drivers/net/Kconfig                    |  747 +-------------------------------
 drivers/net/Makefile                   |   63 +---
 drivers/net/arm/etherh.c               |    2 +-
 drivers/net/{ => legacy}/3c501.c       |    0
 drivers/net/{ => legacy}/3c501.h       |    0
 drivers/net/{ => legacy}/3c503.c       |    0
 drivers/net/{ => legacy}/3c503.h       |    0
 drivers/net/{ => legacy}/3c505.c       |    0
 drivers/net/{ => legacy}/3c505.h       |    0
 drivers/net/{ => legacy}/3c507.c       |    0
 drivers/net/{ => legacy}/3c509.c       |    0
 drivers/net/{ => legacy}/3c515.c       |    0
 drivers/net/{ => legacy}/3c523.c       |    0
 drivers/net/{ => legacy}/3c523.h       |    0
 drivers/net/{ => legacy}/3c527.c       |    0
 drivers/net/{ => legacy}/3c527.h       |    0
 drivers/net/{ => legacy}/7990.c        |    0
 drivers/net/{ => legacy}/7990.h        |    0
 drivers/net/{ => legacy}/82596.c       |    0
 drivers/net/{ => legacy}/8390.c        |    0
 drivers/net/{ => legacy}/8390.h        |    0
 drivers/net/{ => legacy}/8390p.c       |    0
 drivers/net/legacy/Kconfig             |  675 +++++++++++++++++++++++++++++
 drivers/net/{ => legacy}/LICENSE.SRC   |    0
 drivers/net/legacy/Makefile            |   78 ++++
 drivers/net/{ => legacy}/ac3200.c      |    0
 drivers/net/{ => legacy}/apne.c        |    0
 drivers/net/{ => legacy}/ariadne.c     |    0
 drivers/net/{ => legacy}/ariadne.h     |    0
 drivers/net/{ => legacy}/at1700.c      |    0
 drivers/net/{ => legacy}/atarilance.c  |    0
 drivers/net/{ => legacy}/ax88796.c     |    0
 drivers/net/{ => legacy}/de600.c       |    0
 drivers/net/{ => legacy}/de600.h       |    0
 drivers/net/{ => legacy}/de620.c       |    0
 drivers/net/{ => legacy}/de620.h       |    0
 drivers/net/{ => legacy}/declance.c    |    0
 drivers/net/{ => legacy}/defxx.c       |    0
 drivers/net/{ => legacy}/defxx.h       |    0
 drivers/net/{ => legacy}/depca.c       |    0
 drivers/net/{ => legacy}/depca.h       |    0
 drivers/net/{ => legacy}/e2100.c       |    0
 drivers/net/{ => legacy}/eepro.c       |    0
 drivers/net/{ => legacy}/eexpress.c    |    0
 drivers/net/{ => legacy}/eexpress.h    |    0
 drivers/net/{ => legacy}/es3210.c      |    0
 drivers/net/{ => legacy}/eth16i.c      |    0
 drivers/net/{ => legacy}/ewrk3.c       |    0
 drivers/net/{ => legacy}/ewrk3.h       |    0
 drivers/net/{ => legacy}/hp-plus.c     |    0
 drivers/net/{ => legacy}/hp.c          |    0
 drivers/net/{ => legacy}/hplance.c     |    0
 drivers/net/{ => legacy}/hplance.h     |    0
 drivers/net/{ => legacy}/hydra.c       |    0
 drivers/net/{ => legacy}/ibmlana.c     |    0
 drivers/net/{ => legacy}/ibmlana.h     |    0
 drivers/net/{ => legacy}/lance.c       |    0
 drivers/net/{ => legacy}/lasi_82596.c  |    0
 drivers/net/{ => legacy}/lib82596.c    |    0
 drivers/net/{ => legacy}/lib8390.c     |    0
 drivers/net/{ => legacy}/lne390.c      |    0
 drivers/net/{ => legacy}/lp486e.c      |    0
 drivers/net/{ => legacy}/mac8390.c     |    0
 drivers/net/{ => legacy}/mvme147.c     |    0
 drivers/net/{ => legacy}/ne-h8300.c    |    0
 drivers/net/{ => legacy}/ne.c          |    0
 drivers/net/{ => legacy}/ne2.c         |    0
 drivers/net/{ => legacy}/ne2k-pci.c    |    0
 drivers/net/{ => legacy}/ne3210.c      |    0
 drivers/net/{ => legacy}/ni5010.c      |    0
 drivers/net/{ => legacy}/ni5010.h      |    0
 drivers/net/{ => legacy}/ni52.c        |    0
 drivers/net/{ => legacy}/ni52.h        |    0
 drivers/net/{ => legacy}/ni65.c        |    0
 drivers/net/{ => legacy}/ni65.h        |    0
 drivers/net/{ => legacy}/sb1000.c      |    0
 drivers/net/{ => legacy}/seeq8005.c    |    0
 drivers/net/{ => legacy}/seeq8005.h    |    0
 drivers/net/{ => legacy}/smc-mca.c     |    0
 drivers/net/{ => legacy}/smc-ultra.c   |    0
 drivers/net/{ => legacy}/smc-ultra32.c |    0
 drivers/net/{ => legacy}/smc9194.c     |    0
 drivers/net/{ => legacy}/smc9194.h     |    0
 drivers/net/{ => legacy}/sni_82596.c   |    0
 drivers/net/{ => legacy}/stnic.c       |    0
 drivers/net/{ => legacy}/sun3_82586.c  |    0
 drivers/net/{ => legacy}/sun3_82586.h  |    0
 drivers/net/{ => legacy}/sun3lance.c   |    0
 drivers/net/{ => legacy}/wd.c          |    0
 drivers/net/{ => legacy}/znet.c        |    0
 drivers/net/{ => legacy}/zorro8390.c   |    0
 drivers/net/pcmcia/axnet_cs.c          |    2 +-
 drivers/net/pcmcia/pcnet_cs.c          |    2 +-
 94 files changed, 782 insertions(+), 806 deletions(-)
 rename drivers/net/{ => legacy}/3c501.c (100%)
 rename drivers/net/{ => legacy}/3c501.h (100%)
 rename drivers/net/{ => legacy}/3c503.c (100%)
 rename drivers/net/{ => legacy}/3c503.h (100%)
 rename drivers/net/{ => legacy}/3c505.c (100%)
 rename drivers/net/{ => legacy}/3c505.h (100%)
 rename drivers/net/{ => legacy}/3c507.c (100%)
 rename drivers/net/{ => legacy}/3c509.c (100%)
 rename drivers/net/{ => legacy}/3c515.c (100%)
 rename drivers/net/{ => legacy}/3c523.c (100%)
 rename drivers/net/{ => legacy}/3c523.h (100%)
 rename drivers/net/{ => legacy}/3c527.c (100%)
 rename drivers/net/{ => legacy}/3c527.h (100%)
 rename drivers/net/{ => legacy}/7990.c (100%)
 rename drivers/net/{ => legacy}/7990.h (100%)
 rename drivers/net/{ => legacy}/82596.c (100%)
 rename drivers/net/{ => legacy}/8390.c (100%)
 rename drivers/net/{ => legacy}/8390.h (100%)
 rename drivers/net/{ => legacy}/8390p.c (100%)
 create mode 100644 drivers/net/legacy/Kconfig
 rename drivers/net/{ => legacy}/LICENSE.SRC (100%)
 create mode 100644 drivers/net/legacy/Makefile
 rename drivers/net/{ => legacy}/ac3200.c (100%)
 rename drivers/net/{ => legacy}/apne.c (100%)
 rename drivers/net/{ => legacy}/ariadne.c (100%)
 rename drivers/net/{ => legacy}/ariadne.h (100%)
 rename drivers/net/{ => legacy}/at1700.c (100%)
 rename drivers/net/{ => legacy}/atarilance.c (100%)
 rename drivers/net/{ => legacy}/ax88796.c (100%)
 rename drivers/net/{ => legacy}/de600.c (100%)
 rename drivers/net/{ => legacy}/de600.h (100%)
 rename drivers/net/{ => legacy}/de620.c (100%)
 rename drivers/net/{ => legacy}/de620.h (100%)
 rename drivers/net/{ => legacy}/declance.c (100%)
 rename drivers/net/{ => legacy}/defxx.c (100%)
 rename drivers/net/{ => legacy}/defxx.h (100%)
 rename drivers/net/{ => legacy}/depca.c (100%)
 rename drivers/net/{ => legacy}/depca.h (100%)
 rename drivers/net/{ => legacy}/e2100.c (100%)
 rename drivers/net/{ => legacy}/eepro.c (100%)
 rename drivers/net/{ => legacy}/eexpress.c (100%)
 rename drivers/net/{ => legacy}/eexpress.h (100%)
 rename drivers/net/{ => legacy}/es3210.c (100%)
 rename drivers/net/{ => legacy}/eth16i.c (100%)
 rename drivers/net/{ => legacy}/ewrk3.c (100%)
 rename drivers/net/{ => legacy}/ewrk3.h (100%)
 rename drivers/net/{ => legacy}/hp-plus.c (100%)
 rename drivers/net/{ => legacy}/hp.c (100%)
 rename drivers/net/{ => legacy}/hplance.c (100%)
 rename drivers/net/{ => legacy}/hplance.h (100%)
 rename drivers/net/{ => legacy}/hydra.c (100%)
 rename drivers/net/{ => legacy}/ibmlana.c (100%)
 rename drivers/net/{ => legacy}/ibmlana.h (100%)
 rename drivers/net/{ => legacy}/lance.c (100%)
 rename drivers/net/{ => legacy}/lasi_82596.c (100%)
 rename drivers/net/{ => legacy}/lib82596.c (100%)
 rename drivers/net/{ => legacy}/lib8390.c (100%)
 rename drivers/net/{ => legacy}/lne390.c (100%)
 rename drivers/net/{ => legacy}/lp486e.c (100%)
 rename drivers/net/{ => legacy}/mac8390.c (100%)
 rename drivers/net/{ => legacy}/mvme147.c (100%)
 rename drivers/net/{ => legacy}/ne-h8300.c (100%)
 rename drivers/net/{ => legacy}/ne.c (100%)
 rename drivers/net/{ => legacy}/ne2.c (100%)
 rename drivers/net/{ => legacy}/ne2k-pci.c (100%)
 rename drivers/net/{ => legacy}/ne3210.c (100%)
 rename drivers/net/{ => legacy}/ni5010.c (100%)
 rename drivers/net/{ => legacy}/ni5010.h (100%)
 rename drivers/net/{ => legacy}/ni52.c (100%)
 rename drivers/net/{ => legacy}/ni52.h (100%)
 rename drivers/net/{ => legacy}/ni65.c (100%)
 rename drivers/net/{ => legacy}/ni65.h (100%)
 rename drivers/net/{ => legacy}/sb1000.c (100%)
 rename drivers/net/{ => legacy}/seeq8005.c (100%)
 rename drivers/net/{ => legacy}/seeq8005.h (100%)
 rename drivers/net/{ => legacy}/smc-mca.c (100%)
 rename drivers/net/{ => legacy}/smc-ultra.c (100%)
 rename drivers/net/{ => legacy}/smc-ultra32.c (100%)
 rename drivers/net/{ => legacy}/smc9194.c (100%)
 rename drivers/net/{ => legacy}/smc9194.h (100%)
 rename drivers/net/{ => legacy}/sni_82596.c (100%)
 rename drivers/net/{ => legacy}/stnic.c (100%)
 rename drivers/net/{ => legacy}/sun3_82586.c (100%)
 rename drivers/net/{ => legacy}/sun3_82586.h (100%)
 rename drivers/net/{ => legacy}/sun3lance.c (100%)
 rename drivers/net/{ => legacy}/wd.c (100%)
 rename drivers/net/{ => legacy}/znet.c (100%)
 rename drivers/net/{ => legacy}/zorro8390.c (100%)
#1 lore raw

PATCH 1/15 net: introduce legacy dir to absorb 10Mbit, ISA, EISA drivers

There are lots of drivers that date back to the early 1990's when Linux was started, and they correspond to hardware and bus technologies that have largely disappeared from in-use hardware over 10 years ago.

There is no need to have these drivers polluting the namespace in the top level drivers directory any longer; relocation to a subdirectory is long overdue. Start by creating this new home for these drivers so that they can be targeted and relocated.

By leaving the default to include the legacy/Kconfig, we ensure people who have existing stores of their own .config files will not have drivers silently dropped from their builds.

Since the legacy drivers have their probe ordering defined in the Space.c file, we don't have to strictly maintain any link order in moving things from Makefile to legacy/Makefile.

---
 drivers/net/Kconfig         |   14 ++++++++++++++
 drivers/net/Makefile        |    1 +
 drivers/net/legacy/Kconfig  |    2 ++
 drivers/net/legacy/Makefile |    3 +++
 4 files changed, 20 insertions(+), 0 deletions(-)
 create mode 100644 drivers/net/legacy/Kconfig
 create mode 100644 drivers/net/legacy/Makefile
drivers/net/Kconfig +14 -0
index f24179d..9515f76 100644
@@ -28,6 +28,20 @@ menuconfig NETDEVICES
 # that for each of the symbols.
 if NETDEVICES
 
+config NETDEVICES_LEGACY
+	default y
+	bool "Legacy 10+ year old drivers (10Mbit, ISA, EISA, MCA etc.)"
+	---help---
+	  There are a lot of drivers that exist for really old network
+	  hardware that have long since been out of production, and
+	  are not really in active use by anyone with hardware that is
+	  less than ten years old. Unless you are trying to use really
+	  old hardware, you can say no here.
+
+if NETDEVICES_LEGACY
+source "drivers/net/legacy/Kconfig"
+endif
+
 config IFB
 	tristate "Intermediate Functional Block support"
 	depends on NET_CLS_ACT
drivers/net/Makefile +1 -0
index b8bf93d..8045271 100644
@@ -299,3 +299,4 @@ obj-$(CONFIG_CAIF) += caif/
 
 obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/
 obj-$(CONFIG_PCH_GBE) += pch_gbe/
+obj-$(CONFIG_NETDEVICES_LEGACY) += legacy/
drivers/net/legacy/Kconfig new file +2 -0
new file mode 100644
index 0000000..4c23adf
@@ -0,0 +1,2 @@
+
+# Legacy drivers for ancient ISA/EISA bus devices and the like.
drivers/net/legacy/Makefile new file +3 -0
new file mode 100644
index 0000000..33fd752
@@ -0,0 +1,3 @@
+#
+# Makefile for the Linux legacy network device drivers.
+#
Signature · 1 line
1.7.3.2.146.g2d444
#2 lore raw

PATCH 2/15 3c501: relocate ancient 8 bit ISA driver to legacy dir

In reply to Paul Gortmaker

As the oldest bit of "supported" hardware, this 8 bit relic from the 1980's gets the dubious honour of being the 1st driver to be relegated to the dark corners of the legacy dir.

It wasn't really a functional bit of kit back in the early 1990's so don't be expecting it to work now either. Sure it compiles, but it is largely a historical artefact.

---
 drivers/net/Kconfig              |   14 --------------
 drivers/net/Makefile             |    1 -
 drivers/net/{ => legacy}/3c501.c |    0
 drivers/net/{ => legacy}/3c501.h |    0
 drivers/net/legacy/Kconfig       |   14 ++++++++++++++
 drivers/net/legacy/Makefile      |    2 ++
 6 files changed, 16 insertions(+), 15 deletions(-)
 rename drivers/net/{ => legacy}/3c501.c (100%)
 rename drivers/net/{ => legacy}/3c501.h (100%)
drivers/net/Kconfig +0 -14
index 9515f76..cb7f3f4 100644
@@ -641,20 +641,6 @@ config NET_VENDOR_3COM
 	  the questions about 3COM cards. If you say Y, you will be asked for
 	  your specific card in the following questions.
 
-config EL1
-	tristate "3c501 \"EtherLink\" support"
-	depends on NET_VENDOR_3COM && ISA
-	---help---
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.  Also, consider buying a
-	  new card, since the 3c501 is slow, broken, and obsolete: you will
-	  have problems.  Some people suggest to ping ("man ping") a nearby
-	  machine every minute ("man cron") when using this card.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called 3c501.
-
 config EL2
 	tristate "3c503 \"EtherLink II\" support"
 	depends on NET_VENDOR_3COM && ISA
drivers/net/Makefile +0 -1
index 8045271..eb99117 100644
@@ -183,7 +183,6 @@ obj-$(CONFIG_DEFXX) += defxx.o
 obj-$(CONFIG_SGISEEQ) += sgiseeq.o
 obj-$(CONFIG_SGI_O2MACE_ETH) += meth.o
 obj-$(CONFIG_AT1700) += at1700.o
-obj-$(CONFIG_EL1) += 3c501.o
 obj-$(CONFIG_EL16) += 3c507.o
 obj-$(CONFIG_ELMC) += 3c523.o
 obj-$(CONFIG_IBMLANA) += ibmlana.o
drivers/net/legacy/3c501.c renamed from drivers/net/3c501.c +0 -0
similarity index 100%
rename from drivers/net/3c501.c
rename to drivers/net/legacy/3c501.c
drivers/net/legacy/3c501.h renamed from drivers/net/3c501.h +0 -0
similarity index 100%
rename from drivers/net/3c501.h
rename to drivers/net/legacy/3c501.h
drivers/net/legacy/Kconfig +14 -0
index 4c23adf..fa2d6f8 100644
@@ -1,2 +1,16 @@
 
 # Legacy drivers for ancient ISA/EISA bus devices and the like.
+
+config EL1
+	tristate "3c501 \"EtherLink\" support"
+	depends on NET_VENDOR_3COM && ISA
+	---help---
+	  If you have a network (Ethernet) card of this type, say Y and read
+	  the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.  Also, consider buying a
+	  new card, since the 3c501 is slow, broken, and obsolete: you will
+	  have problems.  Some people suggest to ping ("man ping") a nearby
+	  machine every minute ("man cron") when using this card.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called 3c501.
drivers/net/legacy/Makefile +2 -0
index 33fd752..acbf0b2 100644
@@ -1,3 +1,5 @@
 #
 # Makefile for the Linux legacy network device drivers.
 #
+
+obj-$(CONFIG_EL1) += 3c501.o
Signature · 1 line
1.7.3.2.146.g2d444
#3 lore raw

PATCH 3/15 de6xx: relocate ancient parallel port eth drivers to legacy

In reply to Paul Gortmaker

These old drivers pre-date USB, coming from the early 1990's and with the legacy parallel port also now largely gone from any current hardware, these need to be relocated to the legacy directory, since they won't have been in active use for years.

---
 drivers/net/Kconfig              |   30 ------------------------------
 drivers/net/Makefile             |    2 --
 drivers/net/legacy/Kconfig       |   30 ++++++++++++++++++++++++++++++
 drivers/net/legacy/Makefile      |    2 ++
 drivers/net/{ => legacy}/de600.c |    0
 drivers/net/{ => legacy}/de600.h |    0
 drivers/net/{ => legacy}/de620.c |    0
 drivers/net/{ => legacy}/de620.h |    0
 8 files changed, 32 insertions(+), 32 deletions(-)
 rename drivers/net/{ => legacy}/de600.c (100%)
 rename drivers/net/{ => legacy}/de600.h (100%)
 rename drivers/net/{ => legacy}/de620.c (100%)
 rename drivers/net/{ => legacy}/de620.h (100%)
drivers/net/Kconfig +0 -30
index cb7f3f4..eb65a3a 100644
@@ -1867,36 +1867,6 @@ config ATP
 	  To compile this driver as a module, choose M here: the module
 	  will be called atp.
 
-config DE600
-	tristate "D-Link DE600 pocket adapter support"
-	depends on NET_POCKET && PARPORT
-	---help---
-	  This is a network (Ethernet) device which attaches to your parallel
-	  port. Read <file:Documentation/networking/DLINK.txt> as well as the
-	  Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>, if you want to use
-	  this. It is possible to have several devices share a single parallel
-	  port and it is safe to compile the corresponding drivers into the
-	  kernel.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called de600.
-
-config DE620
-	tristate "D-Link DE620 pocket adapter support"
-	depends on NET_POCKET && PARPORT
-	---help---
-	  This is a network (Ethernet) device which attaches to your parallel
-	  port. Read <file:Documentation/networking/DLINK.txt> as well as the
-	  Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>, if you want to use
-	  this. It is possible to have several devices share a single parallel
-	  port and it is safe to compile the corresponding drivers into the
-	  kernel.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called de620.
-
 config SGISEEQ
 	tristate "SGI Seeq ethernet controller support"
 	depends on SGI_HAS_SEEQ
drivers/net/Makefile +0 -2
index eb99117..41594da 100644
@@ -174,8 +174,6 @@ obj-$(CONFIG_DUMMY) += dummy.o
 obj-$(CONFIG_IFB) += ifb.o
 obj-$(CONFIG_MACVLAN) += macvlan.o
 obj-$(CONFIG_MACVTAP) += macvtap.o
-obj-$(CONFIG_DE600) += de600.o
-obj-$(CONFIG_DE620) += de620.o
 obj-$(CONFIG_LANCE) += lance.o
 obj-$(CONFIG_SUN3_82586) += sun3_82586.o
 obj-$(CONFIG_SUN3LANCE) += sun3lance.o
drivers/net/legacy/Kconfig +30 -0
index fa2d6f8..ef6fa1f 100644
@@ -14,3 +14,33 @@ config EL1
 
 	  To compile this driver as a module, choose M here. The module
 	  will be called 3c501.
+
+config DE600
+	tristate "D-Link DE600 pocket adapter support"
+	depends on NET_POCKET && PARPORT
+	---help---
+	  This is a network (Ethernet) device which attaches to your parallel
+	  port. Read <file:Documentation/networking/DLINK.txt> as well as the
+	  Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>, if you want to use
+	  this. It is possible to have several devices share a single parallel
+	  port and it is safe to compile the corresponding drivers into the
+	  kernel.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called de600.
+
+config DE620
+	tristate "D-Link DE620 pocket adapter support"
+	depends on NET_POCKET && PARPORT
+	---help---
+	  This is a network (Ethernet) device which attaches to your parallel
+	  port. Read <file:Documentation/networking/DLINK.txt> as well as the
+	  Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>, if you want to use
+	  this. It is possible to have several devices share a single parallel
+	  port and it is safe to compile the corresponding drivers into the
+	  kernel.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called de620.
drivers/net/legacy/Makefile +2 -0
index acbf0b2..e82ca16 100644
@@ -3,3 +3,5 @@
 #
 
 obj-$(CONFIG_EL1) += 3c501.o
+obj-$(CONFIG_DE600) += de600.o
+obj-$(CONFIG_DE620) += de620.o
drivers/net/legacy/de600.c renamed from drivers/net/de600.c +0 -0
similarity index 100%
rename from drivers/net/de600.c
rename to drivers/net/legacy/de600.c
drivers/net/legacy/de600.h renamed from drivers/net/de600.h +0 -0
similarity index 100%
rename from drivers/net/de600.h
rename to drivers/net/legacy/de600.h
drivers/net/legacy/de620.c renamed from drivers/net/de620.c +0 -0
similarity index 100%
rename from drivers/net/de620.c
rename to drivers/net/legacy/de620.c
drivers/net/legacy/de620.h renamed from drivers/net/de620.h +0 -0
similarity index 100%
rename from drivers/net/de620.h
rename to drivers/net/legacy/de620.h
Signature · 1 line
1.7.3.2.146.g2d444
#4 lore raw

PATCH 4/15 sun3: Relocate the sun3 specific lance/83596 drivers to legacy

In reply to Paul Gortmaker

Relocate these old drivers for really old Sun3 hardware to the legacy dir.

---
 drivers/net/Kconfig                   |   22 ----------------------
 drivers/net/Makefile                  |    2 --
 drivers/net/legacy/Kconfig            |   22 ++++++++++++++++++++++
 drivers/net/legacy/Makefile           |    3 +++
 drivers/net/{ => legacy}/sun3_82586.c |    0
 drivers/net/{ => legacy}/sun3_82586.h |    0
 drivers/net/{ => legacy}/sun3lance.c  |    0
 7 files changed, 25 insertions(+), 24 deletions(-)
 rename drivers/net/{ => legacy}/sun3_82586.c (100%)
 rename drivers/net/{ => legacy}/sun3_82586.h (100%)
 rename drivers/net/{ => legacy}/sun3lance.c (100%)
drivers/net/Kconfig +0 -22
index eb65a3a..511745d 100644
@@ -435,28 +435,6 @@ config ATARILANCE
 	  on the AMD Lance chipset: RieblCard (with or without battery), or
 	  PAMCard VME (also the version by Rhotron, with different addresses).
 
-config SUN3LANCE
-	tristate "Sun3/Sun3x on-board LANCE support"
-	depends on SUN3 || SUN3X
-	help
-	  Most Sun3 and Sun3x motherboards (including the 3/50, 3/60 and 3/80)
-	  featured an AMD Lance 10Mbit Ethernet controller on board; say Y
-	  here to compile in the Linux driver for this and enable Ethernet.
-	  General Linux information on the Sun 3 and 3x series (now
-	  discontinued) is at
-	  <http://www.angelfire.com/ca2/tech68k/sun3.html>.
-
-	  If you're not building a kernel for a Sun 3, say N.
-
-config SUN3_82586
-	bool "Sun3 on-board Intel 82586 support"
-	depends on SUN3
-	help
-	  This driver enables support for the on-board Intel 82586 based
-	  Ethernet adapter found on Sun 3/1xx and 3/2xx motherboards.  Note
-	  that this driver does not support 82586-based adapters on additional
-	  VME boards.
-
 config HPLANCE
 	bool "HP on-board LANCE support"
 	depends on DIO
drivers/net/Makefile +0 -2
index 41594da..152f8b5 100644
@@ -175,8 +175,6 @@ obj-$(CONFIG_IFB) += ifb.o
 obj-$(CONFIG_MACVLAN) += macvlan.o
 obj-$(CONFIG_MACVTAP) += macvtap.o
 obj-$(CONFIG_LANCE) += lance.o
-obj-$(CONFIG_SUN3_82586) += sun3_82586.o
-obj-$(CONFIG_SUN3LANCE) += sun3lance.o
 obj-$(CONFIG_DEFXX) += defxx.o
 obj-$(CONFIG_SGISEEQ) += sgiseeq.o
 obj-$(CONFIG_SGI_O2MACE_ETH) += meth.o
drivers/net/legacy/Kconfig +22 -0
index ef6fa1f..1af0740 100644
@@ -44,3 +44,25 @@ config DE620
 
 	  To compile this driver as a module, choose M here: the module
 	  will be called de620.
+
+config SUN3LANCE
+	tristate "Sun3/Sun3x on-board LANCE support"
+	depends on SUN3 || SUN3X
+	help
+	  Most Sun3 and Sun3x motherboards (including the 3/50, 3/60 and 3/80)
+	  featured an AMD Lance 10Mbit Ethernet controller on board; say Y
+	  here to compile in the Linux driver for this and enable Ethernet.
+	  General Linux information on the Sun 3 and 3x series (now
+	  discontinued) is at
+	  <http://www.angelfire.com/ca2/tech68k/sun3.html>.
+
+	  If you're not building a kernel for a Sun 3, say N.
+
+config SUN3_82586
+	bool "Sun3 on-board Intel 82586 support"
+	depends on SUN3
+	help
+	  This driver enables support for the on-board Intel 82586 based
+	  Ethernet adapter found on Sun 3/1xx and 3/2xx motherboards.  Note
+	  that this driver does not support 82586-based adapters on additional
+	  VME boards.
drivers/net/legacy/Makefile +3 -0
index e82ca16..f552c77 100644
@@ -5,3 +5,6 @@
 obj-$(CONFIG_EL1) += 3c501.o
 obj-$(CONFIG_DE600) += de600.o
 obj-$(CONFIG_DE620) += de620.o
+
+obj-$(CONFIG_SUN3_82586) += sun3_82586.o
+obj-$(CONFIG_SUN3LANCE) += sun3lance.o
drivers/net/legacy/sun3_82586.c renamed from drivers/net/sun3_82586.c +0 -0
similarity index 100%
rename from drivers/net/sun3_82586.c
rename to drivers/net/legacy/sun3_82586.c
drivers/net/legacy/sun3_82586.h renamed from drivers/net/sun3_82586.h +0 -0
similarity index 100%
rename from drivers/net/sun3_82586.h
rename to drivers/net/legacy/sun3_82586.h
drivers/net/legacy/sun3lance.c renamed from drivers/net/sun3lance.c +0 -0
similarity index 100%
rename from drivers/net/sun3lance.c
rename to drivers/net/legacy/sun3lance.c
Signature · 1 line
1.7.3.2.146.g2d444
#5 lore raw

PATCH 5/15 dec netdev: relocate DIGITAL based drivers to legacy

In reply to Paul Gortmaker

DEC as a name brand has been gone for over 10 years, and these drivers represent technology from the 1990's like the venerable ISA bus. Hence relocate them to the legacy dir.

---
 drivers/net/Kconfig                 |   63 -----------------------------------
 drivers/net/Makefile                |    4 --
 drivers/net/legacy/Kconfig          |   63 +++++++++++++++++++++++++++++++++++
 drivers/net/legacy/Makefile         |    5 +++
 drivers/net/{ => legacy}/declance.c |    0
 drivers/net/{ => legacy}/defxx.c    |    0
 drivers/net/{ => legacy}/defxx.h    |    0
 drivers/net/{ => legacy}/depca.c    |    0
 drivers/net/{ => legacy}/depca.h    |    0
 drivers/net/{ => legacy}/ewrk3.c    |    0
 drivers/net/{ => legacy}/ewrk3.h    |    0
 11 files changed, 68 insertions(+), 67 deletions(-)
 rename drivers/net/{ => legacy}/declance.c (100%)
 rename drivers/net/{ => legacy}/defxx.c (100%)
 rename drivers/net/{ => legacy}/defxx.h (100%)
 rename drivers/net/{ => legacy}/depca.c (100%)
 rename drivers/net/{ => legacy}/depca.h (100%)
 rename drivers/net/{ => legacy}/ewrk3.c (100%)
 rename drivers/net/{ => legacy}/ewrk3.h (100%)
drivers/net/Kconfig +0 -63
index 511745d..fb58ea7 100644
@@ -1104,19 +1104,6 @@ config AT1700
 	  To compile this driver as a module, choose M here. The module
 	  will be called at1700.
 
-config DEPCA
-	tristate "DEPCA, DE10x, DE200, DE201, DE202, DE422 support"
-	depends on ISA || EISA || MCA
-	select CRC32
-	---help---
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto> as well as
-	  <file:drivers/net/depca.c>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called depca.
-
 config HP100
 	tristate "HP 10/100VG PCLAN (ISA, EISA, PCI) support"
 	depends on ISA || EISA || PCI
@@ -1157,20 +1144,6 @@ config E2100
 	  To compile this driver as a module, choose M here. The module
 	  will be called e2100.
 
-config EWRK3
-	tristate "EtherWORKS 3 (DE203, DE204, DE205) support"
-	depends on NET_ISA
-	select CRC32
-	---help---
-	  This driver supports the DE203, DE204 and DE205 network (Ethernet)
-	  cards. If this is for you, say Y and read
-	  <file:Documentation/networking/ewrk3.txt> in the kernel source as
-	  well as the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called ewrk3.
-
 config EEXPRESS
 	tristate "EtherExpress 16 support"
 	depends on NET_ISA
@@ -1852,15 +1825,6 @@ config SGISEEQ
 	  Say Y here if you have an Seeq based Ethernet network card. This is
 	  used in many Silicon Graphics machines.
 
-config DECLANCE
-	tristate "DEC LANCE ethernet controller support"
-	depends on MACH_DECSTATION
-	select CRC32
-	help
-	  This driver is for the series of Ethernet controllers produced by
-	  DEC (now Compaq) based on the AMD Lance chipset, including the
-	  DEPCA series.  (This chipset is better known via the NE2100 cards.)
-
 config 68360_ENET
 	bool "Motorola 68360 ethernet controller"
 	depends on M68360
@@ -2913,33 +2877,6 @@ config FDDI
 	  then also Y to the driver for your FDDI card, below). Most people
 	  will say N.
 
-config DEFXX
-	tristate "Digital DEFTA/DEFEA/DEFPA adapter support"
-	depends on FDDI && (PCI || EISA || TC)
-	---help---
-	  This is support for the DIGITAL series of TURBOchannel (DEFTA),
-	  EISA (DEFEA) and PCI (DEFPA) controllers which can connect you
-	  to a local FDDI network.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called defxx.  If unsure, say N.
-
-config DEFXX_MMIO
-	bool
-	prompt "Use MMIO instead of PIO" if PCI || EISA
-	depends on DEFXX
-	default n if PCI || EISA
-	default y
-	---help---
-	  This instructs the driver to use EISA or PCI memory-mapped I/O
-	  (MMIO) as appropriate instead of programmed I/O ports (PIO).
-	  Enabling this gives an improvement in processing time in parts
-	  of the driver, but it may cause problems with EISA (DEFEA)
-	  adapters.  TURBOchannel does not have the concept of I/O ports,
-	  so MMIO is always used for these (DEFTA) adapters.
-
-	  If unsure, say N.
-
 config SKFP
 	tristate "SysKonnect FDDI PCI support"
 	depends on FDDI && PCI
drivers/net/Makefile +0 -4
index 152f8b5..f6536fe 100644
@@ -175,7 +175,6 @@ obj-$(CONFIG_IFB) += ifb.o
 obj-$(CONFIG_MACVLAN) += macvlan.o
 obj-$(CONFIG_MACVTAP) += macvtap.o
 obj-$(CONFIG_LANCE) += lance.o
-obj-$(CONFIG_DEFXX) += defxx.o
 obj-$(CONFIG_SGISEEQ) += sgiseeq.o
 obj-$(CONFIG_SGI_O2MACE_ETH) += meth.o
 obj-$(CONFIG_AT1700) += at1700.o
@@ -191,8 +190,6 @@ obj-$(CONFIG_8139CP) += 8139cp.o
 obj-$(CONFIG_8139TOO) += 8139too.o
 obj-$(CONFIG_ZNET) += znet.o
 obj-$(CONFIG_CPMAC) += cpmac.o
-obj-$(CONFIG_DEPCA) += depca.o
-obj-$(CONFIG_EWRK3) += ewrk3.o
 obj-$(CONFIG_ATP) += atp.o
 obj-$(CONFIG_NI5010) += ni5010.o
 obj-$(CONFIG_NI52) += ni52.o
@@ -219,7 +216,6 @@ obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o
 obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o
 obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
 obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o
-obj-$(CONFIG_DECLANCE) += declance.o
 obj-$(CONFIG_ATARILANCE) += atarilance.o
 obj-$(CONFIG_A2065) += a2065.o
 obj-$(CONFIG_HYDRA) += hydra.o 8390.o
drivers/net/legacy/Kconfig +63 -0

66 lines not on this page · raw message

drivers/net/legacy/Makefile +5 -0
index f552c77..7ab3669 100644
@@ -8,3 +8,8 @@ obj-$(CONFIG_DE620) += de620.o
 
 obj-$(CONFIG_SUN3_82586) += sun3_82586.o
 obj-$(CONFIG_SUN3LANCE) += sun3lance.o
+
+obj-$(CONFIG_DEFXX) += defxx.o
+obj-$(CONFIG_DEPCA) += depca.o
+obj-$(CONFIG_EWRK3) += ewrk3.o
+obj-$(CONFIG_DECLANCE) += declance.o
drivers/net/legacy/declance.c renamed from drivers/net/declance.c +0 -0
similarity index 100%
rename from drivers/net/declance.c
rename to drivers/net/legacy/declance.c
drivers/net/legacy/defxx.c renamed from drivers/net/defxx.c +0 -0
similarity index 100%
rename from drivers/net/defxx.c
rename to drivers/net/legacy/defxx.c
drivers/net/legacy/defxx.h renamed from drivers/net/defxx.h +0 -0
similarity index 100%
rename from drivers/net/defxx.h
rename to drivers/net/legacy/defxx.h
drivers/net/legacy/depca.c renamed from drivers/net/depca.c +0 -0
similarity index 100%
rename from drivers/net/depca.c
rename to drivers/net/legacy/depca.c
drivers/net/legacy/depca.h renamed from drivers/net/depca.h +0 -0
similarity index 100%
rename from drivers/net/depca.h
rename to drivers/net/legacy/depca.h
drivers/net/legacy/ewrk3.c renamed from drivers/net/ewrk3.c +0 -0
similarity index 100%
rename from drivers/net/ewrk3.c
rename to drivers/net/legacy/ewrk3.c
drivers/net/legacy/ewrk3.h renamed from drivers/net/ewrk3.h +0 -0
similarity index 100%
rename from drivers/net/ewrk3.h
rename to drivers/net/legacy/ewrk3.h
Signature · 1 line
1.7.3.2.146.g2d444
#6 lore raw

Re: [PATCH 05/15] dec netdev: relocate DIGITAL based drivers to legacy

Quoted 3 lines · Paul Gortmaker

DEC as a name brand has been gone for over 10 years, and these drivers represent technology from the 1990's like the venerable ISA bus. Hence relocate them to the legacy dir.

NAK for the TURBOchannel bits (defxx.[ch] and declance.c) unless you give
a plausible justification. You won't get these drivers offered unless you have the bus in your system anyway, and if you do than you don't want to have them hidden somewhere in the corner. If you see anything wrong with these drivers, then please do let me know.

Also defxx.c is PCI too (apart from being EISA and TC).

Quoted 13 lines
---
 drivers/net/Kconfig                 |   63 -----------------------------------
 drivers/net/Makefile                |    4 --
 drivers/net/legacy/Kconfig          |   63 +++++++++++++++++++++++++++++++++++
 drivers/net/legacy/Makefile         |    5 +++
 drivers/net/{ => legacy}/declance.c |    0
 drivers/net/{ => legacy}/defxx.c    |    0
 drivers/net/{ => legacy}/defxx.h    |    0
 drivers/net/{ => legacy}/depca.c    |    0
 drivers/net/{ => legacy}/depca.h    |    0
 drivers/net/{ => legacy}/ewrk3.c    |    0
 drivers/net/{ => legacy}/ewrk3.h    |    0

Maciej

maintainer
#7 lore raw

Re: [PATCH 05/15] dec netdev: relocate DIGITAL based drivers to legacy

From: "Maciej W. Rozycki" <[email protected]>
Date: Fri, 29 Oct 2010 05:21:35 +0100 (BST)

Quoted 6 lines · Paul Gortmaker
Quoted 4 lines

DEC as a name brand has been gone for over 10 years, and these drivers represent technology from the 1990's like the venerable ISA bus. Hence relocate them to the legacy dir.

Quoted 7 lines

NAK for the TURBOchannel bits (defxx.[ch] and declance.c) unless you give
a plausible justification. You won't get these drivers offered unless you have the bus in your system anyway, and if you do than you don't want to have them hidden somewhere in the corner. If you see anything wrong with these drivers, then please do let me know.

Also defxx.c is PCI too (apart from being EISA and TC).

PCI things can be legacy too.

This is not about a specific bus technology, it's simply for "really old stuff" so we can declutter the top-level of drivers/net

#8 lore raw

Re: [PATCH 05/15] dec netdev: relocate DIGITAL based drivers to legacy

Quoted 6 lines · David Miller
Quoted 6 lines

NAK for the TURBOchannel bits (defxx.[ch] and declance.c) unless you give
a plausible justification. You won't get these drivers offered unless you have the bus in your system anyway, and if you do than you don't want to have them hidden somewhere in the corner. If you see anything wrong with these drivers, then please do let me know.

Quoted 6 lines
Quoted 1 line

Also defxx.c is PCI too (apart from being EISA and TC).

PCI things can be legacy too.

This is not about a specific bus technology, it's simply for "really old stuff" so we can declutter the top-level of drivers/net

Hmm, what's the difference between placing these drivers here or there
and what's so particular about them that they cause clutter? I mean a mere high number of items does not cause a mess by itself -- the lack of order might.

Also -- if this change goes ahead -- when I add new TURBOchannel drivers,
should they go straight to legacy/? It sounds odd to me to have a thing obsolete straight from the beginning.

Maciej

#9 lore raw

Re: [PATCH 05/15] dec netdev: relocate DIGITAL based drivers to legacy

Quoted 7 lines · Maciej W. Rozycki
Quoted 2 lines

This is not about a specific bus technology, it's simply for "really old stuff" so we can declutter the top-level of drivers/net

Hmm, what's the difference between placing these drivers here or there
and what's so particular about them that they cause clutter? I mean a mere high number of items does not cause a mess by itself -- the lack of order might.

I have given myself some food for thought and have come up with the
following proposal: how about simply classifying drivers according to the physical layer they support or if multiple are, such as with the Ethernet that is backwards compatible, the newest variation they do?

This would be no different to what we do wrt network protocols under
net/, so drivers would go to ethernet/, fasteth/, gbeth/, 10gbeth/, fddi/, tokenring/, atm/, appletalk/, etc. (names up to debate if need be) as applicable. This would scale well, avoid the need for arbitrary decisions (is this piece legacy yet or not?) and automatically classify drivers as more or less obsolescent too, as obviously none of the stuff under ethernet/, fddi/ or tokenring/ can be reasonably recent unlike 10gbeth/.

Software stuff such as SLIP or PPP could go either into separate
subdirectories or grouped together under software/; I gather we have a few such pieces only.

What do you think?

Maciej

maintainer
#10 lore raw

Re: [PATCH 05/15] dec netdev: relocate DIGITAL based drivers to legacy

From: "Maciej W. Rozycki" <[email protected]>
Date: Fri, 29 Oct 2010 06:46:13 +0100 (BST)

Quoted 7 lines

This would be no different to what we do wrt network protocols under
net/, so drivers would go to ethernet/, fasteth/, gbeth/, 10gbeth/, fddi/, tokenring/, atm/, appletalk/, etc. (names up to debate if need be) as applicable. This would scale well, avoid the need for arbitrary decisions (is this piece legacy yet or not?) and automatically classify drivers as more or less obsolescent too, as obviously none of the stuff under ethernet/, fddi/ or tokenring/ can be reasonably recent unlike 10gbeth/.

Why are you so hung up about something being called legacy?

I would be proud to be labelled "legacy", as that means I've served a purpose for a long time and some folks even want or need me to stick around for a bit longer.

Legacy hardware is just old and the drivers for them are in a purely "sustaining" state, that is all.

And using link layer technology to classify is really stupid since many devices match multiple of the categories you've suggested.

I think the existing proposal is just fine.

maintainer
#11 lore raw

Re: [PATCH 05/15] dec netdev: relocate DIGITAL based drivers to legacy

In reply to Maciej W. Rozycki

From: "Maciej W. Rozycki" <[email protected]>
Date: Fri, 29 Oct 2010 05:54:56 +0100 (BST)

Quoted 8 lines

Hmm, what's the difference between placing these drivers here or there
and what's so particular about them that they cause clutter? I mean a mere high number of items does not cause a mess by itself -- the lack of order might.

Also -- if this change goes ahead -- when I add new TURBOchannel drivers,
should they go straight to legacy/? It sounds odd to me to have a thing obsolete straight from the beginning.

This patch series started with a "0/15" introduction posting which explains the intention and reasoning.

It might be easier for you to read it instead of asking me to repeat it's contents :-)

#12 lore raw

Re: [PATCH 05/15] dec netdev: relocate DIGITAL based drivers to legacy

Quoted 2 lines · David Miller

This patch series started with a "0/15" introduction posting which explains the intention and reasoning.

Well, I didn't reach it (ENOBREAKFAST that has been fixed since ;) ), but
I sort of guessed it anyway and didn't like the arbitrary nature of assigning drivers to legacy/.

Quoted 2 lines

It might be easier for you to read it instead of asking me to repeat it's contents :-)

See my proposal that crossed with your e-mail. I think it fits the
purpose very well. :)

Maciej

maintainer
#13 lore raw

Re: [PATCH 05/15] dec netdev: relocate DIGITAL based drivers to legacy

From: "Maciej W. Rozycki" <[email protected]>
Date: Fri, 29 Oct 2010 06:50:17 +0100 (BST)

Quoted 7 lines · David Miller
Quoted 3 lines

It might be easier for you to read it instead of asking me to repeat it's contents :-)

See my proposal that crossed with your e-mail. I think it fits the
purpose very well. :)

No, it's foolish, see my reply.

#14 lore raw

Re: [PATCH 05/15] dec netdev: relocate DIGITAL based drivers to legacy

Quoted 4 lines · David Miller
Quoted 2 lines

See my proposal that crossed with your e-mail. I think it fits the
purpose very well. :)

No, it's foolish, see my reply.

Well, you are the maintainer, so it's your call. I disagree and I have
given what I believe is a reasonable justification, but that's about as much as I can do -- I can't force it onto you. As I say my concern is about the arbitrary assignment and not things being called "legacy" or "best-ever", "pre-y2k", or whatever. And splitting a bunch of pieces of software that are loosely related to one another into two bunches isn't going to reduce clutter, but to spread it instead -- now you'll have clutter in two places rather than just one, so I think the change is just missing the point. Again, as the maintainer it's your right to disagree.

Thank you for the time you've taken to consider my comments nonetheless.

Maciej

#15 lore raw

PATCH 6/15 netdev: relocate i8258x and i8259x based drivers to legacy

In reply to Paul Gortmaker

This chipset was predominately deployed on hardware in the early to mid 1990's -- on ISA bus hardware and similar. Move these old drivers to the legacy dir.

---
 drivers/net/Kconfig                   |  133 ---------------------------------
 drivers/net/Makefile                  |   16 ----
 drivers/net/{ => legacy}/3c505.c      |    0
 drivers/net/{ => legacy}/3c505.h      |    0
 drivers/net/{ => legacy}/3c507.c      |    0
 drivers/net/{ => legacy}/3c523.c      |    0
 drivers/net/{ => legacy}/3c523.h      |    0
 drivers/net/{ => legacy}/3c527.c      |    0
 drivers/net/{ => legacy}/3c527.h      |    0
 drivers/net/{ => legacy}/82596.c      |    0
 drivers/net/legacy/Kconfig            |  133 +++++++++++++++++++++++++++++++++
 drivers/net/legacy/Makefile           |   17 ++++
 drivers/net/{ => legacy}/eepro.c      |    0
 drivers/net/{ => legacy}/eexpress.c   |    0
 drivers/net/{ => legacy}/eexpress.h   |    0
 drivers/net/{ => legacy}/lasi_82596.c |    0
 drivers/net/{ => legacy}/lib82596.c   |    0
 drivers/net/{ => legacy}/lp486e.c     |    0
 drivers/net/{ => legacy}/ni52.c       |    0
 drivers/net/{ => legacy}/ni52.h       |    0
 drivers/net/{ => legacy}/sni_82596.c  |    0
 drivers/net/{ => legacy}/znet.c       |    0
 22 files changed, 150 insertions(+), 149 deletions(-)
 rename drivers/net/{ => legacy}/3c505.c (100%)
 rename drivers/net/{ => legacy}/3c505.h (100%)
 rename drivers/net/{ => legacy}/3c507.c (100%)
 rename drivers/net/{ => legacy}/3c523.c (100%)
 rename drivers/net/{ => legacy}/3c523.h (100%)
 rename drivers/net/{ => legacy}/3c527.c (100%)
 rename drivers/net/{ => legacy}/3c527.h (100%)
 rename drivers/net/{ => legacy}/82596.c (100%)
 rename drivers/net/{ => legacy}/eepro.c (100%)
 rename drivers/net/{ => legacy}/eexpress.c (100%)
 rename drivers/net/{ => legacy}/eexpress.h (100%)
 rename drivers/net/{ => legacy}/lasi_82596.c (100%)
 rename drivers/net/{ => legacy}/lib82596.c (100%)
 rename drivers/net/{ => legacy}/lp486e.c (100%)
 rename drivers/net/{ => legacy}/ni52.c (100%)
 rename drivers/net/{ => legacy}/ni52.h (100%)
 rename drivers/net/{ => legacy}/sni_82596.c (100%)
 rename drivers/net/{ => legacy}/znet.c (100%)
drivers/net/Kconfig +0 -133
index fb58ea7..db8261c 100644
@@ -409,24 +409,6 @@ config MVME147_NET
 	  driver for this chip in your kernel.
 	  To compile this driver as a module, choose M here.
 
-config MVME16x_NET
-	tristate "MVME16x Ethernet support"
-	depends on MVME16x
-	help
-	  This is the driver for the Ethernet interface on the Motorola
-	  MVME162, 166, 167, 172 and 177 boards.  Say Y here to include the
-	  driver for this chip in your kernel.
-	  To compile this driver as a module, choose M here.
-
-config BVME6000_NET
-	tristate "BVME6000 Ethernet support"
-	depends on BVME6000
-	help
-	  This is the driver for the Ethernet interface on BVME4000 and
-	  BVME6000 VME boards.  Say Y here to include the driver for this chip
-	  in your kernel.
-	  To compile this driver as a module, choose M here.
-
 config ATARILANCE
 	tristate "Atari Lance support"
 	depends on ATARI
@@ -443,20 +425,6 @@ config HPLANCE
 	  If you want to use the builtin "LANCE" Ethernet controller on an
 	  HP300 machine, say Y here.
 
-config LASI_82596
-	tristate "Lasi ethernet"
-	depends on GSC
-	help
-	  Say Y here to support the builtin Intel 82596 ethernet controller
-	  found in Hewlett-Packard PA-RISC machines with 10Mbit ethernet.
-
-config SNI_82596
-	tristate "SNI RM ethernet"
-	depends on NET_ETHERNET && SNI_RM
-	help
-	  Say Y here to support the on-board Intel 82596 ethernet controller
-	  built into SNI RM machines.
-
 config KORINA
 	tristate "Korina (IDT RC32434) Ethernet support"
 	depends on NET_ETHERNET && MIKROTIK_RB532
@@ -631,29 +599,6 @@ config EL2
 	  To compile this driver as a module, choose M here. The module
 	  will be called 3c503.
 
-config ELPLUS
-	tristate "3c505 \"EtherLink Plus\" support"
-	depends on NET_VENDOR_3COM && ISA && ISA_DMA_API
-	---help---
-	  Information about this network (Ethernet) card can be found in
-	  <file:Documentation/networking/3c505.txt>.  If you have a card of
-	  this type, say Y and read the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called 3c505.
-
-config EL16
-	tristate "3c507 \"EtherLink 16\" support (EXPERIMENTAL)"
-	depends on NET_VENDOR_3COM && ISA && EXPERIMENTAL
-	help
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called 3c507.
-
 config EL3
 	tristate "3c509/3c529 (MCA)/3c579 \"EtherLink III\" support"
 	depends on NET_VENDOR_3COM && (ISA || EISA || MCA)
@@ -680,28 +625,6 @@ config 3C515
 	  To compile this driver as a module, choose M here. The module
 	  will be called 3c515.
 
-config ELMC
-	tristate "3c523 \"EtherLink/MC\" support"
-	depends on NET_VENDOR_3COM && MCA_LEGACY
-	help
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called 3c523.
-
-config ELMC_II
-	tristate "3c527 \"EtherLink/MC 32\" support (EXPERIMENTAL)"
-	depends on NET_VENDOR_3COM && MCA && MCA_LEGACY
-	help
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called 3c527.
-
 config VORTEX
 	tristate "3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" support"
 	depends on NET_VENDOR_3COM && (PCI || EISA)
@@ -1057,17 +980,6 @@ config NI5010
 	  To compile this driver as a module, choose M here. The module
 	  will be called ni5010.
 
-config NI52
-	tristate "NI5210 support"
-	depends on NET_VENDOR_RACAL && ISA
-	help
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called ni52.
-
 config NI65
 	tristate "NI6510 support"
 	depends on NET_VENDOR_RACAL && ISA && ISA_DMA_API
@@ -1144,33 +1056,6 @@ config E2100
 	  To compile this driver as a module, choose M here. The module
 	  will be called e2100.
 
-config EEXPRESS
-	tristate "EtherExpress 16 support"
-	depends on NET_ISA
-	---help---
-	  If you have an EtherExpress16 network (Ethernet) card, say Y and
-	  read the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.  Note that the Intel
-	  EtherExpress16 card used to be regarded as a very poor choice
-	  because the driver was very unreliable. We now have a new driver
-	  that should do better.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called eexpress.
-
-config EEXPRESS_PRO
-	tristate "EtherExpressPro support/EtherExpress 10 (i82595) support"
-	depends on NET_ISA
-	---help---
-	  If you have a network (Ethernet) card of this type, say Y. This
-	  driver supports Intel i82595{FX,TX} based boards. Note however
-	  that the EtherExpress PRO/100 Ethernet card has its own separate
-	  driver.  Please read the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called eepro.
-
 config HPLAN_PLUS
 	tristate "HP PCLAN+ (27247B and 27252A) support"
 	depends on NET_ISA
@@ -1195,14 +1080,6 @@ config HPLAN
 	  To compile this driver as a module, choose M here. The module
 	  will be called hp.
 
-config LP486E
-	tristate "LP486E on board Ethernet"
-	depends on NET_ISA
-	help
-	  Say Y here to support the 82596-based on-board Ethernet controller
-	  for the Panther motherboard, which is one of the two shipped in the
-	  Intel Professional Workstation.
-
 config ETH16I
 	tristate "ICL EtherTeam 16i/32 support"
 	depends on NET_ISA
@@ -1234,16 +1111,6 @@ config NE2000
 	  To compile this driver as a module, choose M here. The module
 	  will be called ne.
 
-config ZNET
-	tristate "Zenith Z-Note support (EXPERIMENTAL)"
-	depends on NET_ISA && EXPERIMENTAL && ISA_DMA_API
-	help
-	  The Zenith Z-Note notebook computer has a built-in network
-	  (Ethernet) card, and this is the Linux driver for it. Note that the
-	  IBM Thinkpad 300 is compatible with the Z-Note and is also supported
-	  by this driver. Read the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
 config SEEQ8005
 	tristate "SEEQ8005 support (EXPERIMENTAL)"
 	depends on NET_ISA && EXPERIMENTAL
drivers/net/Makefile +0 -16
index f6536fe..3fd125e 100644
@@ -178,34 +178,18 @@ obj-$(CONFIG_LANCE) += lance.o
 obj-$(CONFIG_SGISEEQ) += sgiseeq.o
 obj-$(CONFIG_SGI_O2MACE_ETH) += meth.o
 obj-$(CONFIG_AT1700) += at1700.o
-obj-$(CONFIG_EL16) += 3c507.o
-obj-$(CONFIG_ELMC) += 3c523.o
 obj-$(CONFIG_IBMLANA) += ibmlana.o
-obj-$(CONFIG_ELMC_II) += 3c527.o
 obj-$(CONFIG_EL3) += 3c509.o
 obj-$(CONFIG_3C515) += 3c515.o
-obj-$(CONFIG_EEXPRESS) += eexpress.o
-obj-$(CONFIG_EEXPRESS_PRO) += eepro.o
 obj-$(CONFIG_8139CP) += 8139cp.o
 obj-$(CONFIG_8139TOO) += 8139too.o
-obj-$(CONFIG_ZNET) += znet.o
 obj-$(CONFIG_CPMAC) += cpmac.o
 obj-$(CONFIG_ATP) += atp.o
 obj-$(CONFIG_NI5010) += ni5010.o
-obj-$(CONFIG_NI52) += ni52.o
 obj-$(CONFIG_NI65) += ni65.o
-obj-$(CONFIG_ELPLUS) += 3c505.o
 obj-$(CONFIG_AC3200) += ac3200.o 8390.o
-obj-$(CONFIG_APRICOT) += 82596.o
-obj-$(CONFIG_LASI_82596) += lasi_82596.o
-obj-$(CONFIG_SNI_82596) += sni_82596.o
-obj-$(CONFIG_MVME16x_NET) += 82596.o
-obj-$(CONFIG_BVME6000_NET) += 82596.o
 obj-$(CONFIG_SC92031) += sc92031.o
 
-# This is also a 82596 and should probably be merged
-obj-$(CONFIG_LP486E) += lp486e.o
-
 obj-$(CONFIG_ETH16I) += eth16i.o
 obj-$(CONFIG_ZORRO8390) += zorro8390.o 8390.o
 obj-$(CONFIG_HPLANCE) += hplance.o 7990.o
drivers/net/legacy/3c505.c renamed from drivers/net/3c505.c +0 -0
similarity index 100%
rename from drivers/net/3c505.c
rename to drivers/net/legacy/3c505.c
drivers/net/legacy/3c505.h renamed from drivers/net/3c505.h +0 -0
similarity index 100%
rename from drivers/net/3c505.h
rename to drivers/net/legacy/3c505.h
drivers/net/legacy/3c507.c renamed from drivers/net/3c507.c +0 -0
similarity index 100%
rename from drivers/net/3c507.c
rename to drivers/net/legacy/3c507.c
drivers/net/legacy/3c523.c renamed from drivers/net/3c523.c +0 -0
similarity index 100%
rename from drivers/net/3c523.c
rename to drivers/net/legacy/3c523.c
drivers/net/legacy/3c523.h renamed from drivers/net/3c523.h +0 -0
similarity index 100%
rename from drivers/net/3c523.h
rename to drivers/net/legacy/3c523.h
drivers/net/legacy/3c527.c renamed from drivers/net/3c527.c +0 -0
similarity index 100%
rename from drivers/net/3c527.c
rename to drivers/net/legacy/3c527.c
drivers/net/legacy/3c527.h renamed from drivers/net/3c527.h +0 -0
similarity index 100%
rename from drivers/net/3c527.h
rename to drivers/net/legacy/3c527.h
drivers/net/legacy/82596.c renamed from drivers/net/82596.c +0 -0
similarity index 100%
rename from drivers/net/82596.c
rename to drivers/net/legacy/82596.c
drivers/net/legacy/Kconfig +133 -0

136 lines not on this page · raw message

drivers/net/legacy/Makefile +17 -0
index 7ab3669..b605648 100644
@@ -13,3 +13,20 @@ obj-$(CONFIG_DEFXX) += defxx.o
 obj-$(CONFIG_DEPCA) += depca.o
 obj-$(CONFIG_EWRK3) += ewrk3.o
 obj-$(CONFIG_DECLANCE) += declance.o
+
+# 825xx based cards
+obj-$(CONFIG_APRICOT) += 82596.o
+obj-$(CONFIG_BVME6000_NET) += 82596.o
+obj-$(CONFIG_ELPLUS) += 3c505.o
+obj-$(CONFIG_EL16) += 3c507.o
+obj-$(CONFIG_ELMC) += 3c523.o
+obj-$(CONFIG_ELMC_II) += 3c527.o
+obj-$(CONFIG_EEXPRESS) += eexpress.o
+obj-$(CONFIG_EEXPRESS_PRO) += eepro.o
+obj-$(CONFIG_LASI_82596) += lasi_82596.o
+obj-$(CONFIG_LP486E) += lp486e.o
+obj-$(CONFIG_MVME16x_NET) += 82596.o
+obj-$(CONFIG_NI52) += ni52.o
+obj-$(CONFIG_SNI_82596) += sni_82596.o
+obj-$(CONFIG_ZNET) += znet.o
+
drivers/net/legacy/eepro.c renamed from drivers/net/eepro.c +0 -0
similarity index 100%
rename from drivers/net/eepro.c
rename to drivers/net/legacy/eepro.c
drivers/net/legacy/eexpress.c renamed from drivers/net/eexpress.c +0 -0
similarity index 100%
rename from drivers/net/eexpress.c
rename to drivers/net/legacy/eexpress.c
drivers/net/legacy/eexpress.h renamed from drivers/net/eexpress.h +0 -0
similarity index 100%
rename from drivers/net/eexpress.h
rename to drivers/net/legacy/eexpress.h
drivers/net/legacy/lasi_82596.c renamed from drivers/net/lasi_82596.c +0 -0
similarity index 100%
rename from drivers/net/lasi_82596.c
rename to drivers/net/legacy/lasi_82596.c
drivers/net/legacy/lib82596.c renamed from drivers/net/lib82596.c +0 -0
similarity index 100%
rename from drivers/net/lib82596.c
rename to drivers/net/legacy/lib82596.c
drivers/net/legacy/lp486e.c renamed from drivers/net/lp486e.c +0 -0
similarity index 100%
rename from drivers/net/lp486e.c
rename to drivers/net/legacy/lp486e.c
drivers/net/legacy/ni52.c renamed from drivers/net/ni52.c +0 -0
similarity index 100%
rename from drivers/net/ni52.c
rename to drivers/net/legacy/ni52.c
drivers/net/legacy/ni52.h renamed from drivers/net/ni52.h +0 -0
similarity index 100%
rename from drivers/net/ni52.h
rename to drivers/net/legacy/ni52.h
drivers/net/legacy/sni_82596.c renamed from drivers/net/sni_82596.c +0 -0
similarity index 100%
rename from drivers/net/sni_82596.c
rename to drivers/net/legacy/sni_82596.c
drivers/net/legacy/znet.c renamed from drivers/net/znet.c +0 -0
similarity index 100%
rename from drivers/net/znet.c
rename to drivers/net/legacy/znet.c
Signature · 1 line
1.7.3.2.146.g2d444
#16 lore raw

PATCH 7/15 lance: relocate legacy 7990 based drivers to legacy

In reply to Paul Gortmaker

The original ISA 7990 chip was good for its day, given that it had bus mastering capabilities instead of the PIO or shared memory modes of the other hardware devices of the day. However it is now also no longer really relevant and so move the related drivers off to the legacy directory.

I've left sunlance where it is, since it is still in both sparc defconfig files.

---
 drivers/net/Kconfig                   |   59 ---------------------------------
 drivers/net/Makefile                  |    6 ---
 drivers/net/{ => legacy}/7990.c       |    0
 drivers/net/{ => legacy}/7990.h       |    0
 drivers/net/legacy/Kconfig            |   59 +++++++++++++++++++++++++++++++++
 drivers/net/legacy/Makefile           |    7 ++++
 drivers/net/{ => legacy}/ariadne.c    |    0
 drivers/net/{ => legacy}/ariadne.h    |    0
 drivers/net/{ => legacy}/atarilance.c |    0
 drivers/net/{ => legacy}/hplance.c    |    0
 drivers/net/{ => legacy}/hplance.h    |    0
 drivers/net/{ => legacy}/lance.c      |    0
 drivers/net/{ => legacy}/mvme147.c    |    0
 drivers/net/{ => legacy}/ni65.c       |    0
 drivers/net/{ => legacy}/ni65.h       |    0
 15 files changed, 66 insertions(+), 65 deletions(-)
 rename drivers/net/{ => legacy}/7990.c (100%)
 rename drivers/net/{ => legacy}/7990.h (100%)
 rename drivers/net/{ => legacy}/ariadne.c (100%)
 rename drivers/net/{ => legacy}/ariadne.h (100%)
 rename drivers/net/{ => legacy}/atarilance.c (100%)
 rename drivers/net/{ => legacy}/hplance.c (100%)
 rename drivers/net/{ => legacy}/hplance.h (100%)
 rename drivers/net/{ => legacy}/lance.c (100%)
 rename drivers/net/{ => legacy}/mvme147.c (100%)
 rename drivers/net/{ => legacy}/ni65.c (100%)
 rename drivers/net/{ => legacy}/ni65.h (100%)
drivers/net/Kconfig +0 -59
index db8261c..6ef5848 100644
@@ -299,16 +299,6 @@ config BMAC
 	  To compile this driver as a module, choose M here: the module
 	  will be called bmac.
 
-config ARIADNE
-	tristate "Ariadne support"
-	depends on ZORRO
-	help
-	  If you have a Village Tronic Ariadne Ethernet adapter, say Y.
-	  Otherwise, say N.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called ariadne.
-
 config A2065
 	tristate "A2065 support"
 	depends on ZORRO
@@ -399,32 +389,6 @@ config MACMACE
 	  say Y and read the Ethernet-HOWTO, available from
 	  <http://www.tldp.org/docs.html#howto>.
 
-config MVME147_NET
-	tristate "MVME147 (Lance) Ethernet support"
-	depends on MVME147
-	select CRC32
-	help
-	  Support for the on-board Ethernet interface on the Motorola MVME147
-	  single-board computer.  Say Y here to include the
-	  driver for this chip in your kernel.
-	  To compile this driver as a module, choose M here.
-
-config ATARILANCE
-	tristate "Atari Lance support"
-	depends on ATARI
-	help
-	  Say Y to include support for several Atari Ethernet adapters based
-	  on the AMD Lance chipset: RieblCard (with or without battery), or
-	  PAMCard VME (also the version by Rhotron, with different addresses).
-
-config HPLANCE
-	bool "HP on-board LANCE support"
-	depends on DIO
-	select CRC32
-	help
-	  If you want to use the builtin "LANCE" Ethernet controller on an
-	  HP300 machine, say Y here.
-
 config KORINA
 	tristate "Korina (IDT RC32434) Ethernet support"
 	depends on NET_ETHERNET && MIKROTIK_RB532
@@ -665,18 +629,6 @@ config TYPHOON
 	  To compile this driver as a module, choose M here. The module
 	  will be called typhoon.
 
-config LANCE
-	tristate "AMD LANCE and PCnet (AT1500 and NE2100) support"
-	depends on ISA && ISA_DMA_API
-	help
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>. Some LinkSys cards are
-	  of this type.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called lance.  This is recommended.
-
 config NET_VENDOR_SMC
 	bool "Western Digital/SMC cards"
 	depends on ISA || MCA || EISA || MAC
@@ -980,17 +932,6 @@ config NI5010
 	  To compile this driver as a module, choose M here. The module
 	  will be called ni5010.
 
-config NI65
-	tristate "NI6510 support"
-	depends on NET_VENDOR_RACAL && ISA && ISA_DMA_API
-	help
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called ni65.
-
 config DNET
 	tristate "Dave ethernet support (DNET)"
 	depends on NET_ETHERNET && HAS_IOMEM
drivers/net/Makefile +0 -6
index 3fd125e..68c1eb9 100644
@@ -174,7 +174,6 @@ obj-$(CONFIG_DUMMY) += dummy.o
 obj-$(CONFIG_IFB) += ifb.o
 obj-$(CONFIG_MACVLAN) += macvlan.o
 obj-$(CONFIG_MACVTAP) += macvtap.o
-obj-$(CONFIG_LANCE) += lance.o
 obj-$(CONFIG_SGISEEQ) += sgiseeq.o
 obj-$(CONFIG_SGI_O2MACE_ETH) += meth.o
 obj-$(CONFIG_AT1700) += at1700.o
@@ -186,24 +185,19 @@ obj-$(CONFIG_8139TOO) += 8139too.o
 obj-$(CONFIG_CPMAC) += cpmac.o
 obj-$(CONFIG_ATP) += atp.o
 obj-$(CONFIG_NI5010) += ni5010.o
-obj-$(CONFIG_NI65) += ni65.o
 obj-$(CONFIG_AC3200) += ac3200.o 8390.o
 obj-$(CONFIG_SC92031) += sc92031.o
 
 obj-$(CONFIG_ETH16I) += eth16i.o
 obj-$(CONFIG_ZORRO8390) += zorro8390.o 8390.o
-obj-$(CONFIG_HPLANCE) += hplance.o 7990.o
-obj-$(CONFIG_MVME147_NET) += mvme147.o 7990.o
 obj-$(CONFIG_EQUALIZER) += eql.o
 obj-$(CONFIG_KORINA) += korina.o
 obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o
 obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o
 obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
 obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o
-obj-$(CONFIG_ATARILANCE) += atarilance.o
 obj-$(CONFIG_A2065) += a2065.o
 obj-$(CONFIG_HYDRA) += hydra.o 8390.o
-obj-$(CONFIG_ARIADNE) += ariadne.o
 obj-$(CONFIG_CS89x0) += cs89x0.o
 obj-$(CONFIG_MACSONIC) += macsonic.o
 obj-$(CONFIG_MACMACE) += macmace.o
drivers/net/legacy/7990.c renamed from drivers/net/7990.c +0 -0
similarity index 100%
rename from drivers/net/7990.c
rename to drivers/net/legacy/7990.c
drivers/net/legacy/7990.h renamed from drivers/net/7990.h +0 -0
similarity index 100%
rename from drivers/net/7990.h
rename to drivers/net/legacy/7990.h
drivers/net/legacy/Kconfig +59 -0

62 lines not on this page · raw message

drivers/net/legacy/Makefile +7 -0
index b605648..0eb679c 100644
@@ -30,3 +30,10 @@ obj-$(CONFIG_NI52) += ni52.o
 obj-$(CONFIG_SNI_82596) += sni_82596.o
 obj-$(CONFIG_ZNET) += znet.o
 
+# Lance based cards
+obj-$(CONFIG_ATARILANCE) += atarilance.o
+obj-$(CONFIG_ARIADNE) += ariadne.o
+obj-$(CONFIG_HPLANCE) += hplance.o 7990.o
+obj-$(CONFIG_LANCE) += lance.o
+obj-$(CONFIG_MVME147_NET) += mvme147.o 7990.o
+obj-$(CONFIG_NI65) += ni65.o
drivers/net/legacy/ariadne.c renamed from drivers/net/ariadne.c +0 -0
similarity index 100%
rename from drivers/net/ariadne.c
rename to drivers/net/legacy/ariadne.c
drivers/net/legacy/ariadne.h renamed from drivers/net/ariadne.h +0 -0
similarity index 100%
rename from drivers/net/ariadne.h
rename to drivers/net/legacy/ariadne.h
drivers/net/legacy/atarilance.c renamed from drivers/net/atarilance.c +0 -0
similarity index 100%
rename from drivers/net/atarilance.c
rename to drivers/net/legacy/atarilance.c
drivers/net/legacy/hplance.c renamed from drivers/net/hplance.c +0 -0
similarity index 100%
rename from drivers/net/hplance.c
rename to drivers/net/legacy/hplance.c
drivers/net/legacy/hplance.h renamed from drivers/net/hplance.h +0 -0
similarity index 100%
rename from drivers/net/hplance.h
rename to drivers/net/legacy/hplance.h
drivers/net/legacy/lance.c renamed from drivers/net/lance.c +0 -0
similarity index 100%
rename from drivers/net/lance.c
rename to drivers/net/legacy/lance.c
drivers/net/legacy/mvme147.c renamed from drivers/net/mvme147.c +0 -0
similarity index 100%
rename from drivers/net/mvme147.c
rename to drivers/net/legacy/mvme147.c
drivers/net/legacy/ni65.c renamed from drivers/net/ni65.c +0 -0
similarity index 100%
rename from drivers/net/ni65.c
rename to drivers/net/legacy/ni65.c
drivers/net/legacy/ni65.h renamed from drivers/net/ni65.h +0 -0
similarity index 100%
rename from drivers/net/ni65.h
rename to drivers/net/legacy/ni65.h
Signature · 1 line
1.7.3.2.146.g2d444
#17 lore raw

PATCH 8/15 netdev: relocate toplevel 8390 based drivers to legacy dir

In reply to Paul Gortmaker

With the original 8 bit ISA ne1000 card being over 20 years old, it only makes sense to relocate ne.c and all the other toplevel 8390 based driver files to the legacy dir. Largely the most recent thing made in large quantities that was 8390 based was those crazy PCI ne2k clones - and even they are now 10 years old.

The couple other non-toplevel drivers (arm, pcmcia), which source 8390.h or lib8390.c are just updated in place to have the legacy part added to their path.

---
 drivers/net/Kconfig                    |  226 --------------------------------
 drivers/net/Makefile                   |   23 ----
 drivers/net/arm/etherh.c               |    2 +-
 drivers/net/{ => legacy}/3c503.c       |    0
 drivers/net/{ => legacy}/3c503.h       |    0
 drivers/net/{ => legacy}/8390.c        |    0
 drivers/net/{ => legacy}/8390.h        |    0
 drivers/net/{ => legacy}/8390p.c       |    0
 drivers/net/legacy/Kconfig             |  226 ++++++++++++++++++++++++++++++++
 drivers/net/legacy/Makefile            |   29 ++++
 drivers/net/{ => legacy}/ac3200.c      |    0
 drivers/net/{ => legacy}/apne.c        |    0
 drivers/net/{ => legacy}/ax88796.c     |    0
 drivers/net/{ => legacy}/e2100.c       |    0
 drivers/net/{ => legacy}/es3210.c      |    0
 drivers/net/{ => legacy}/hp-plus.c     |    0
 drivers/net/{ => legacy}/hp.c          |    0
 drivers/net/{ => legacy}/hydra.c       |    0
 drivers/net/{ => legacy}/lib8390.c     |    0
 drivers/net/{ => legacy}/lne390.c      |    0
 drivers/net/{ => legacy}/mac8390.c     |    0
 drivers/net/{ => legacy}/ne-h8300.c    |    0
 drivers/net/{ => legacy}/ne.c          |    0
 drivers/net/{ => legacy}/ne2.c         |    0
 drivers/net/{ => legacy}/ne2k-pci.c    |    0
 drivers/net/{ => legacy}/ne3210.c      |    0
 drivers/net/{ => legacy}/smc-mca.c     |    0
 drivers/net/{ => legacy}/smc-ultra.c   |    0
 drivers/net/{ => legacy}/smc-ultra32.c |    0
 drivers/net/{ => legacy}/stnic.c       |    0
 drivers/net/{ => legacy}/wd.c          |    0
 drivers/net/{ => legacy}/zorro8390.c   |    0
 drivers/net/pcmcia/axnet_cs.c          |    2 +-
 drivers/net/pcmcia/pcnet_cs.c          |    2 +-
 34 files changed, 258 insertions(+), 252 deletions(-)
 rename drivers/net/{ => legacy}/3c503.c (100%)
 rename drivers/net/{ => legacy}/3c503.h (100%)
 rename drivers/net/{ => legacy}/8390.c (100%)
 rename drivers/net/{ => legacy}/8390.h (100%)
 rename drivers/net/{ => legacy}/8390p.c (100%)
 rename drivers/net/{ => legacy}/ac3200.c (100%)
 rename drivers/net/{ => legacy}/apne.c (100%)
 rename drivers/net/{ => legacy}/ax88796.c (100%)
 rename drivers/net/{ => legacy}/e2100.c (100%)
 rename drivers/net/{ => legacy}/es3210.c (100%)
 rename drivers/net/{ => legacy}/hp-plus.c (100%)
 rename drivers/net/{ => legacy}/hp.c (100%)
 rename drivers/net/{ => legacy}/hydra.c (100%)
 rename drivers/net/{ => legacy}/lib8390.c (100%)
 rename drivers/net/{ => legacy}/lne390.c (100%)
 rename drivers/net/{ => legacy}/mac8390.c (100%)
 rename drivers/net/{ => legacy}/ne-h8300.c (100%)
 rename drivers/net/{ => legacy}/ne.c (100%)
 rename drivers/net/{ => legacy}/ne2.c (100%)
 rename drivers/net/{ => legacy}/ne2k-pci.c (100%)
 rename drivers/net/{ => legacy}/ne3210.c (100%)
 rename drivers/net/{ => legacy}/smc-mca.c (100%)
 rename drivers/net/{ => legacy}/smc-ultra.c (100%)
 rename drivers/net/{ => legacy}/smc-ultra32.c (100%)
 rename drivers/net/{ => legacy}/stnic.c (100%)
 rename drivers/net/{ => legacy}/wd.c (100%)
 rename drivers/net/{ => legacy}/zorro8390.c (100%)
drivers/net/Kconfig +0 -226
index 6ef5848..9f6315c 100644
@@ -249,22 +249,6 @@ config MACB
 
 source "drivers/net/arm/Kconfig"
 
-config AX88796
-	tristate "ASIX AX88796 NE2000 clone support"
-	depends on ARM || MIPS || SUPERH
-	select CRC32
-	select MII
-	help
-	  AX88796 driver, using platform bus to provide
-	  chip detection and resources
-
-config AX88796_93CX6
-	bool "ASIX AX88796 external 93CX6 eeprom support"
-	depends on AX88796
-	select EEPROM_93CX6
-	help
-	  Select this if your platform comes with an external 93CX6 eeprom.
-
 config MACE
 	tristate "MACE (Power Mac ethernet) support"
 	depends on PPC_PMAC && PPC32
@@ -310,50 +294,6 @@ config A2065
 	  To compile this driver as a module, choose M here: the module
 	  will be called a2065.
 
-config HYDRA
-	tristate "Hydra support"
-	depends on ZORRO
-	select CRC32
-	help
-	  If you have a Hydra Ethernet adapter, say Y. Otherwise, say N.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called hydra.
-
-config ZORRO8390
-	tristate "Zorro NS8390-based Ethernet support"
-	depends on ZORRO
-	select CRC32
-	help
-	  This driver is for Zorro Ethernet cards using an NS8390-compatible
-	  chipset, like the Village Tronic Ariadne II and the Individual
-	  Computers X-Surf Ethernet cards. If you have such a card, say Y.
-	  Otherwise, say N.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called zorro8390.
-
-config APNE
-	tristate "PCMCIA NE2000 support"
-	depends on AMIGA_PCMCIA
-	select CRC32
-	help
-	  If you have a PCMCIA NE2000 compatible adapter, say Y.  Otherwise,
-	  say N.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called apne.
-
-config MAC8390
-	bool "Macintosh NS 8390 based ethernet cards"
-	depends on MAC
-	select CRC32
-	help
-	  If you want to include a driver to support Nubus or LC-PDS
-	  Ethernet cards using an NS8390 chipset or its equivalent, say Y
-	  and read the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
 config MAC89x0
 	tristate "Macintosh CS89x0 based ethernet cards"
 	depends on MAC
@@ -440,18 +380,6 @@ config SGI_O2MACE_ETH
 	tristate "SGI O2 MACE Fast Ethernet support"
 	depends on SGI_IP32=y
 
-config STNIC
-	tristate "National DP83902AV  support"
-	depends on SUPERH
-	select CRC32
-	help
-	  Support for cards based on the National Semiconductor DP83902AV
-	  ST-NIC Serial Network Interface Controller for Twisted Pair.  This
-	  is a 10Mbit/sec Ethernet controller.  Product overview and specs at
-	  <http://www.national.com/pf/DP/DP83902A.html>.
-
-	  If unsure, say N.
-
 config SH_ETH
 	tristate "Renesas SuperH Ethernet support"
 	depends on SUPERH && \
@@ -551,18 +479,6 @@ config NET_VENDOR_3COM
 	  the questions about 3COM cards. If you say Y, you will be asked for
 	  your specific card in the following questions.
 
-config EL2
-	tristate "3c503 \"EtherLink II\" support"
-	depends on NET_VENDOR_3COM && ISA
-	select CRC32
-	help
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called 3c503.
-
 config EL3
 	tristate "3c509/3c529 (MCA)/3c579 \"EtherLink III\" support"
 	depends on NET_VENDOR_3COM && (ISA || EISA || MCA)
@@ -642,61 +558,6 @@ config NET_VENDOR_SMC
 	  the questions about Western Digital cards. If you say Y, you will be
 	  asked for your specific card in the following questions.
 
-config WD80x3
-	tristate "WD80*3 support"
-	depends on NET_VENDOR_SMC && ISA
-	select CRC32
-	help
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called wd.
-
-config ULTRAMCA
-	tristate "SMC Ultra MCA support"
-	depends on NET_VENDOR_SMC && MCA
-	select CRC32
-	help
-	  If you have a network (Ethernet) card of this type and are running
-	  an MCA based system (PS/2), say Y and read the Ethernet-HOWTO,
-	  available from <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called smc-mca.
-
-config ULTRA
-	tristate "SMC Ultra support"
-	depends on NET_VENDOR_SMC && ISA
-	select CRC32
-	---help---
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  Important: There have been many reports that, with some motherboards
-	  mixing an SMC Ultra and an Adaptec AHA154x SCSI card (or compatible,
-	  such as some BusLogic models) causes corruption problems with many
-	  operating systems. The Linux smc-ultra driver has a work-around for
-	  this but keep it in mind if you have such a SCSI card and have
-	  problems.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called smc-ultra.
-
-config ULTRA32
-	tristate "SMC Ultra32 EISA support"
-	depends on NET_VENDOR_SMC && EISA
-	select CRC32
-	help
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called smc-ultra32.
-
 config BFIN_MAC
 	tristate "Blackfin on-chip MAC support"
 	depends on NET_ETHERNET && (BF516 || BF518 || BF526 || BF527 || BF536 || BF537)
@@ -985,42 +846,6 @@ config NET_ISA
 	  the remaining ISA network card questions. If you say Y, you will be
 	  asked for your specific card in the following questions.
 
-config E2100
-	tristate "Cabletron E21xx support"
-	depends on NET_ISA
-	select CRC32
-	help
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called e2100.
-
-config HPLAN_PLUS
-	tristate "HP PCLAN+ (27247B and 27252A) support"
-	depends on NET_ISA
-	select CRC32
-	help
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called hp-plus.
-
-config HPLAN
-	tristate "HP PCLAN (27245 and other 27xxx series) support"
-	depends on NET_ISA
-	select CRC32
-	help
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called hp.
-
 config ETH16I
 	tristate "ICL EtherTeam 16i/32 support"
 	depends on NET_ISA
@@ -1032,26 +857,6 @@ config ETH16I
 	  To compile this driver as a module, choose M here. The module
 	  will be called eth16i.
 
-config NE2000
-	tristate "NE2000/NE1000 support"
-	depends on NET_ISA || (Q40 && m) || M32R || MACH_TX49XX
-	select CRC32
-	---help---
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.  Many Ethernet cards
-	  without a specific driver are compatible with NE2000.
-
-	  If you have a PCI NE2000 card however, say N here and Y to "PCI
-	  NE2000 and clone support" under "EISA, VLB, PCI and on board
-	  controllers" below. If you have a NE2000 card and are running on
-	  an MCA system (a bus system used on some IBM PS/2 computers and
-	  laptops), say N here and Y to "NE/2 (ne2000 MCA version) support",
-	  below.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called ne.
-
 config SEEQ8005
 	tristate "SEEQ8005 support (EXPERIMENTAL)"
 	depends on NET_ISA && EXPERIMENTAL
@@ -1063,18 +868,6 @@ config SEEQ8005
 	  To compile this driver as a module, choose M here. The module
 	  will be called seeq8005.
 
-config NE2_MCA
-	tristate "NE/2 (ne2000 MCA version) support"
-	depends on MCA_LEGACY
-	select CRC32
-	help
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called ne2.
-
 config IBMLANA
 	tristate "IBM LAN Adapter/A support"
 	depends on MCA
@@ -1283,18 +1076,6 @@ config E100
 	  To compile this driver as a module, choose M here. The module
 	  will be called e100.
 
-config LNE390
-	tristate "Mylex EISA LNE390A/B support (EXPERIMENTAL)"
-	depends on NET_PCI && EISA && EXPERIMENTAL
-	select CRC32
-	help
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called lne390.
-
 config FEALNX
 	tristate "Myson MTD-8xx PCI Ethernet support"
 	depends on NET_PCI && PCI
@@ -1679,13 +1460,6 @@ config FEC_MPC52xx_MDIO
 	  If not sure, enable.
 	  If compiled as module, it will be called fec_mpc52xx_phy.
 
-config NE_H8300
-	tristate "NE2000 compatible support for H8/300"
-	depends on H8300
-	help
-	  Say Y here if you want to use the NE2000 compatible
-	  controller on the Renesas H8/300 processor.
-
 config ATL2
 	tristate "Atheros L2 Fast Ethernet support"
 	depends on PCI
drivers/net/Makefile +0 -23
index 68c1eb9..e5015c6 100644
@@ -66,7 +66,6 @@ obj-$(CONFIG_BMAC) += bmac.o
 
 obj-$(CONFIG_VORTEX) += 3c59x.o
 obj-$(CONFIG_TYPHOON) += typhoon.o
-obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o
 obj-$(CONFIG_PCNET32) += pcnet32.o
 obj-$(CONFIG_E100) += e100.o
 obj-$(CONFIG_TLAN) += tlan.o
@@ -80,7 +79,6 @@ obj-$(CONFIG_ACENIC) += acenic.o
 obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o
 obj-$(CONFIG_NATSEMI) += natsemi.o
 obj-$(CONFIG_NS83820) += ns83820.o
-obj-$(CONFIG_STNIC) += stnic.o 8390.o
 obj-$(CONFIG_FEALNX) += fealnx.o
 obj-$(CONFIG_TIGON3) += tg3.o
 obj-$(CONFIG_BNX2) += bnx2.o
@@ -115,9 +113,6 @@ obj-$(CONFIG_HAMACHI) += hamachi.o
 obj-$(CONFIG_NET) += Space.o loopback.o
 obj-$(CONFIG_SEEQ8005) += seeq8005.o
 obj-$(CONFIG_NET_SB1000) += sb1000.o
-obj-$(CONFIG_MAC8390) += mac8390.o
-obj-$(CONFIG_APNE) += apne.o 8390.o
-obj-$(CONFIG_PCMCIA_PCNET) += 8390.o
 obj-$(CONFIG_HP100) += hp100.o
 obj-$(CONFIG_SMC9194) += smc9194.o
 obj-$(CONFIG_FEC) += fec.o
@@ -126,24 +121,9 @@ ifeq ($(CONFIG_FEC_MPC52xx_MDIO),y)
 	obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx_phy.o
 endif
 obj-$(CONFIG_68360_ENET) += 68360enet.o
-obj-$(CONFIG_WD80x3) += wd.o 8390.o
-obj-$(CONFIG_EL2) += 3c503.o 8390p.o
-obj-$(CONFIG_NE2000) += ne.o 8390p.o
-obj-$(CONFIG_NE2_MCA) += ne2.o 8390p.o
-obj-$(CONFIG_HPLAN) += hp.o 8390p.o
-obj-$(CONFIG_HPLAN_PLUS) += hp-plus.o 8390p.o
-obj-$(CONFIG_ULTRA) += smc-ultra.o 8390.o
-obj-$(CONFIG_ULTRAMCA) += smc-mca.o 8390.o
-obj-$(CONFIG_ULTRA32) += smc-ultra32.o 8390.o
-obj-$(CONFIG_E2100) += e2100.o 8390.o
-obj-$(CONFIG_ES3210) += es3210.o 8390.o
-obj-$(CONFIG_LNE390) += lne390.o 8390.o
-obj-$(CONFIG_NE3210) += ne3210.o 8390.o
 obj-$(CONFIG_SB1250_MAC) += sb1250-mac.o
 obj-$(CONFIG_B44) += b44.o
 obj-$(CONFIG_FORCEDETH) += forcedeth.o
-obj-$(CONFIG_NE_H8300) += ne-h8300.o 8390.o
-obj-$(CONFIG_AX88796) += ax88796.o
 obj-$(CONFIG_BCM63XX_ENET) += bcm63xx_enet.o
 
 obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o
@@ -185,11 +165,9 @@ obj-$(CONFIG_8139TOO) += 8139too.o
 obj-$(CONFIG_CPMAC) += cpmac.o
 obj-$(CONFIG_ATP) += atp.o
 obj-$(CONFIG_NI5010) += ni5010.o
-obj-$(CONFIG_AC3200) += ac3200.o 8390.o
 obj-$(CONFIG_SC92031) += sc92031.o
 
 obj-$(CONFIG_ETH16I) += eth16i.o
-obj-$(CONFIG_ZORRO8390) += zorro8390.o 8390.o
 obj-$(CONFIG_EQUALIZER) += eql.o
 obj-$(CONFIG_KORINA) += korina.o
 obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o
@@ -197,7 +175,6 @@ obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o
 obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
 obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o
 obj-$(CONFIG_A2065) += a2065.o
-obj-$(CONFIG_HYDRA) += hydra.o 8390.o
 obj-$(CONFIG_CS89x0) += cs89x0.o
 obj-$(CONFIG_MACSONIC) += macsonic.o
 obj-$(CONFIG_MACMACE) += macmace.o
drivers/net/arm/etherh.c +1 -1
index 4af235d..0e60f86 100644
@@ -65,7 +65,7 @@
 static char version[] __initdata =
 	"EtherH/EtherM Driver (c) 2002-2004 Russell King " DRV_VERSION "\n";
 
-#include "../lib8390.c"
+#include "../legacy/lib8390.c"
 
 static unsigned int net_debug = NET_DEBUG;
 
drivers/net/legacy/3c503.c renamed from drivers/net/3c503.c +0 -0
similarity index 100%
rename from drivers/net/3c503.c
rename to drivers/net/legacy/3c503.c
drivers/net/legacy/3c503.h renamed from drivers/net/3c503.h +0 -0
similarity index 100%
rename from drivers/net/3c503.h
rename to drivers/net/legacy/3c503.h
drivers/net/legacy/8390.c renamed from drivers/net/8390.c +0 -0
similarity index 100%
rename from drivers/net/8390.c
rename to drivers/net/legacy/8390.c
drivers/net/legacy/8390.h renamed from drivers/net/8390.h +0 -0
similarity index 100%
rename from drivers/net/8390.h
rename to drivers/net/legacy/8390.h
drivers/net/legacy/8390p.c renamed from drivers/net/8390p.c +0 -0
similarity index 100%
rename from drivers/net/8390p.c
rename to drivers/net/legacy/8390p.c
drivers/net/legacy/Kconfig +226 -0

229 lines not on this page · raw message

drivers/net/legacy/Makefile +29 -0
index 0eb679c..eefacda 100644
@@ -37,3 +37,32 @@ obj-$(CONFIG_HPLANCE) += hplance.o 7990.o
 obj-$(CONFIG_LANCE) += lance.o
 obj-$(CONFIG_MVME147_NET) += mvme147.o 7990.o
 obj-$(CONFIG_NI65) += ni65.o
+
+# ISA 8390 based
+obj-$(CONFIG_E2100) += e2100.o 8390.o
+obj-$(CONFIG_EL2) += 3c503.o 8390p.o
+obj-$(CONFIG_HPLAN) += hp.o 8390p.o
+obj-$(CONFIG_HPLAN_PLUS) += hp-plus.o 8390p.o
+obj-$(CONFIG_NE2000) += ne.o 8390p.o
+obj-$(CONFIG_ULTRA) += smc-ultra.o 8390.o
+obj-$(CONFIG_WD80x3) += wd.o 8390.o
+
+# EISA 8390 based
+obj-$(CONFIG_AC3200) += ac3200.o 8390.o
+obj-$(CONFIG_ES3210) += es3210.o 8390.o
+obj-$(CONFIG_LNE390) += lne390.o 8390.o
+obj-$(CONFIG_NE3210) += ne3210.o 8390.o
+obj-$(CONFIG_ULTRA32) += smc-ultra32.o 8390.o
+
+# Other 8390 based hardware.
+obj-$(CONFIG_APNE) += apne.o 8390.o
+obj-$(CONFIG_AX88796) += ax88796.o
+obj-$(CONFIG_HYDRA) += hydra.o 8390.o
+obj-$(CONFIG_MAC8390) += mac8390.o
+obj-$(CONFIG_NE2_MCA) += ne2.o 8390p.o
+obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o
+obj-$(CONFIG_NE_H8300) += ne-h8300.o 8390.o
+obj-$(CONFIG_PCMCIA_PCNET) += 8390.o
+obj-$(CONFIG_ULTRAMCA) += smc-mca.o 8390.o
+obj-$(CONFIG_STNIC) += stnic.o 8390.o
+obj-$(CONFIG_ZORRO8390) += zorro8390.o 8390.o
drivers/net/legacy/ac3200.c renamed from drivers/net/ac3200.c +0 -0
similarity index 100%
rename from drivers/net/ac3200.c
rename to drivers/net/legacy/ac3200.c
drivers/net/legacy/apne.c renamed from drivers/net/apne.c +0 -0
similarity index 100%
rename from drivers/net/apne.c
rename to drivers/net/legacy/apne.c
drivers/net/legacy/ax88796.c renamed from drivers/net/ax88796.c +0 -0
similarity index 100%
rename from drivers/net/ax88796.c
rename to drivers/net/legacy/ax88796.c
drivers/net/legacy/e2100.c renamed from drivers/net/e2100.c +0 -0
similarity index 100%
rename from drivers/net/e2100.c
rename to drivers/net/legacy/e2100.c
drivers/net/legacy/es3210.c renamed from drivers/net/es3210.c +0 -0
similarity index 100%
rename from drivers/net/es3210.c
rename to drivers/net/legacy/es3210.c
drivers/net/legacy/hp-plus.c renamed from drivers/net/hp-plus.c +0 -0
similarity index 100%
rename from drivers/net/hp-plus.c
rename to drivers/net/legacy/hp-plus.c
drivers/net/legacy/hp.c renamed from drivers/net/hp.c +0 -0
similarity index 100%
rename from drivers/net/hp.c
rename to drivers/net/legacy/hp.c
drivers/net/legacy/hydra.c renamed from drivers/net/hydra.c +0 -0
similarity index 100%
rename from drivers/net/hydra.c
rename to drivers/net/legacy/hydra.c
drivers/net/legacy/lib8390.c renamed from drivers/net/lib8390.c +0 -0
similarity index 100%
rename from drivers/net/lib8390.c
rename to drivers/net/legacy/lib8390.c
drivers/net/legacy/lne390.c renamed from drivers/net/lne390.c +0 -0
similarity index 100%
rename from drivers/net/lne390.c
rename to drivers/net/legacy/lne390.c
drivers/net/legacy/mac8390.c renamed from drivers/net/mac8390.c +0 -0
similarity index 100%
rename from drivers/net/mac8390.c
rename to drivers/net/legacy/mac8390.c
drivers/net/legacy/ne-h8300.c renamed from drivers/net/ne-h8300.c +0 -0
similarity index 100%
rename from drivers/net/ne-h8300.c
rename to drivers/net/legacy/ne-h8300.c
drivers/net/legacy/ne.c renamed from drivers/net/ne.c +0 -0
similarity index 100%
rename from drivers/net/ne.c
rename to drivers/net/legacy/ne.c
drivers/net/legacy/ne2.c renamed from drivers/net/ne2.c +0 -0
similarity index 100%
rename from drivers/net/ne2.c
rename to drivers/net/legacy/ne2.c
drivers/net/legacy/ne2k-pci.c renamed from drivers/net/ne2k-pci.c +0 -0
similarity index 100%
rename from drivers/net/ne2k-pci.c
rename to drivers/net/legacy/ne2k-pci.c
drivers/net/legacy/ne3210.c renamed from drivers/net/ne3210.c +0 -0
similarity index 100%
rename from drivers/net/ne3210.c
rename to drivers/net/legacy/ne3210.c
drivers/net/legacy/smc-mca.c renamed from drivers/net/smc-mca.c +0 -0
similarity index 100%
rename from drivers/net/smc-mca.c
rename to drivers/net/legacy/smc-mca.c
drivers/net/legacy/smc-ultra.c renamed from drivers/net/smc-ultra.c +0 -0
similarity index 100%
rename from drivers/net/smc-ultra.c
rename to drivers/net/legacy/smc-ultra.c
drivers/net/legacy/smc-ultra32.c renamed from drivers/net/smc-ultra32.c +0 -0
similarity index 100%
rename from drivers/net/smc-ultra32.c
rename to drivers/net/legacy/smc-ultra32.c
drivers/net/legacy/stnic.c renamed from drivers/net/stnic.c +0 -0
similarity index 100%
rename from drivers/net/stnic.c
rename to drivers/net/legacy/stnic.c
drivers/net/legacy/wd.c renamed from drivers/net/wd.c +0 -0
similarity index 100%
rename from drivers/net/wd.c
rename to drivers/net/legacy/wd.c
drivers/net/legacy/zorro8390.c renamed from drivers/net/zorro8390.c +0 -0
similarity index 100%
rename from drivers/net/zorro8390.c
rename to drivers/net/legacy/zorro8390.c
drivers/net/pcmcia/axnet_cs.c +1 -1
index d2e166e..65314e8 100644
@@ -38,7 +38,7 @@
 #include <linux/etherdevice.h>
 #include <linux/crc32.h>
 #include <linux/mii.h>
-#include "../8390.h"
+#include "../legacy/8390.h"
 
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ciscode.h>
drivers/net/pcmcia/pcnet_cs.c +1 -1
index 03096c8..6e7731e 100644
@@ -41,7 +41,7 @@
 #include <linux/log2.h>
 #include <linux/etherdevice.h>
 #include <linux/mii.h>
-#include "../8390.h"
+#include "../legacy/8390.h"
 
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ciscode.h>
Signature · 1 line
1.7.3.2.146.g2d444
#18 lore raw

PATCH 9/15 netdev: relocate remaining ISA 3Com cards to legacy dir

In reply to Paul Gortmaker

The last mainstream motherboards produced with ISA slots were some P3 Coppermine socket370 platforms with a single ISA slot from around the turn of the century.

---
 drivers/net/Kconfig              |   26 --------------------------
 drivers/net/Makefile             |    2 --
 drivers/net/{ => legacy}/3c509.c |    0
 drivers/net/{ => legacy}/3c515.c |    0
 drivers/net/legacy/Kconfig       |   26 ++++++++++++++++++++++++++
 drivers/net/legacy/Makefile      |    4 ++++
 6 files changed, 30 insertions(+), 28 deletions(-)
 rename drivers/net/{ => legacy}/3c509.c (100%)
 rename drivers/net/{ => legacy}/3c515.c (100%)
drivers/net/Kconfig +0 -26
index 9f6315c..5b6c3e9 100644
@@ -479,32 +479,6 @@ config NET_VENDOR_3COM
 	  the questions about 3COM cards. If you say Y, you will be asked for
 	  your specific card in the following questions.
 
-config EL3
-	tristate "3c509/3c529 (MCA)/3c579 \"EtherLink III\" support"
-	depends on NET_VENDOR_3COM && (ISA || EISA || MCA)
-	---help---
-	  If you have a network (Ethernet) card belonging to the 3Com
-	  EtherLinkIII series, say Y and read the Ethernet-HOWTO, available
-	  from <http://www.tldp.org/docs.html#howto>.
-
-	  If your card is not working you may need to use the DOS
-	  setup disk to disable Plug & Play mode, and to select the default
-	  media type.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called 3c509.
-
-config 3C515
-	tristate "3c515 ISA \"Fast EtherLink\""
-	depends on NET_VENDOR_3COM && (ISA || EISA) && ISA_DMA_API
-	help
-	  If you have a 3Com ISA EtherLink XL "Corkscrew" 3c515 Fast Ethernet
-	  network card, say Y and read the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called 3c515.
-
 config VORTEX
 	tristate "3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" support"
 	depends on NET_VENDOR_3COM && (PCI || EISA)
drivers/net/Makefile +0 -2
index e5015c6..790bb6c 100644
@@ -158,8 +158,6 @@ obj-$(CONFIG_SGISEEQ) += sgiseeq.o
 obj-$(CONFIG_SGI_O2MACE_ETH) += meth.o
 obj-$(CONFIG_AT1700) += at1700.o
 obj-$(CONFIG_IBMLANA) += ibmlana.o
-obj-$(CONFIG_EL3) += 3c509.o
-obj-$(CONFIG_3C515) += 3c515.o
 obj-$(CONFIG_8139CP) += 8139cp.o
 obj-$(CONFIG_8139TOO) += 8139too.o
 obj-$(CONFIG_CPMAC) += cpmac.o
drivers/net/legacy/3c509.c renamed from drivers/net/3c509.c +0 -0
similarity index 100%
rename from drivers/net/3c509.c
rename to drivers/net/legacy/3c509.c
drivers/net/legacy/3c515.c renamed from drivers/net/3c515.c +0 -0
similarity index 100%
rename from drivers/net/3c515.c
rename to drivers/net/legacy/3c515.c
drivers/net/legacy/Kconfig +26 -0
index 74644b8..c4cdc99 100644
@@ -15,6 +15,32 @@ config EL1
 	  To compile this driver as a module, choose M here. The module
 	  will be called 3c501.
 
+config EL3
+	tristate "3c509/3c529 (MCA)/3c579 \"EtherLink III\" support"
+	depends on NET_VENDOR_3COM && (ISA || EISA || MCA)
+	---help---
+	  If you have a network (Ethernet) card belonging to the 3Com
+	  EtherLinkIII series, say Y and read the Ethernet-HOWTO, available
+	  from <http://www.tldp.org/docs.html#howto>.
+
+	  If your card is not working you may need to use the DOS
+	  setup disk to disable Plug & Play mode, and to select the default
+	  media type.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called 3c509.
+
+config 3C515
+	tristate "3c515 ISA \"Fast EtherLink\""
+	depends on NET_VENDOR_3COM && (ISA || EISA) && ISA_DMA_API
+	help
+	  If you have a 3Com ISA EtherLink XL "Corkscrew" 3c515 Fast Ethernet
+	  network card, say Y and read the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called 3c515.
+
 config DE600
 	tristate "D-Link DE600 pocket adapter support"
 	depends on NET_POCKET && PARPORT
drivers/net/legacy/Makefile +4 -0
index eefacda..5341a1d 100644
@@ -66,3 +66,7 @@ obj-$(CONFIG_PCMCIA_PCNET) += 8390.o
 obj-$(CONFIG_ULTRAMCA) += smc-mca.o 8390.o
 obj-$(CONFIG_STNIC) += stnic.o 8390.o
 obj-$(CONFIG_ZORRO8390) += zorro8390.o 8390.o
+
+# Other random one-off cards
+obj-$(CONFIG_EL3) += 3c509.o
+obj-$(CONFIG_3C515) += 3c515.o
Signature · 1 line
1.7.3.2.146.g2d444
#19 lore raw

PATCH 10/15 netdev: relocate more one-off drivers to the legacy dir

In reply to Paul Gortmaker

These one-off ISA/EISA/MCA drivers have been around since the beginning of time; relocate them off to the legacy dir.

---
 drivers/net/Kconfig                 |   76 -----------------------------------
 drivers/net/Makefile                |    5 --
 drivers/net/legacy/Kconfig          |   76 +++++++++++++++++++++++++++++++++++
 drivers/net/legacy/Makefile         |    5 ++
 drivers/net/{ => legacy}/at1700.c   |    0
 drivers/net/{ => legacy}/eth16i.c   |    0
 drivers/net/{ => legacy}/ibmlana.c  |    0
 drivers/net/{ => legacy}/ibmlana.h  |    0
 drivers/net/{ => legacy}/ni5010.c   |    0
 drivers/net/{ => legacy}/ni5010.h   |    0
 drivers/net/{ => legacy}/seeq8005.c |    0
 drivers/net/{ => legacy}/seeq8005.h |    0
 drivers/net/{ => legacy}/smc9194.c  |    0
 drivers/net/{ => legacy}/smc9194.h  |    0
 14 files changed, 81 insertions(+), 81 deletions(-)
 rename drivers/net/{ => legacy}/at1700.c (100%)
 rename drivers/net/{ => legacy}/eth16i.c (100%)
 rename drivers/net/{ => legacy}/ibmlana.c (100%)
 rename drivers/net/{ => legacy}/ibmlana.h (100%)
 rename drivers/net/{ => legacy}/ni5010.c (100%)
 rename drivers/net/{ => legacy}/ni5010.h (100%)
 rename drivers/net/{ => legacy}/seeq8005.c (100%)
 rename drivers/net/{ => legacy}/seeq8005.h (100%)
 rename drivers/net/{ => legacy}/smc9194.c (100%)
 rename drivers/net/{ => legacy}/smc9194.h (100%)
drivers/net/Kconfig +0 -76
index 5b6c3e9..b5adf52 100644
@@ -586,21 +586,6 @@ config BFIN_MAC_USE_HWSTAMP
 	help
 	  To support the IEEE 1588 Precision Time Protocol (PTP), select y here
 
-config SMC9194
-	tristate "SMC 9194 support"
-	depends on NET_VENDOR_SMC && (ISA || MAC && BROKEN)
-	select CRC32
-	---help---
-	  This is support for the SMC9xxx based Ethernet cards. Choose this
-	  option if you have a DELL laptop with the docking station, or
-	  another SMC9192/9194 based chipset.  Say Y if you want it compiled
-	  into the kernel, and read the file
-	  <file:Documentation/networking/smc9.txt> and the Ethernet-HOWTO,
-	  available from <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called smc9194.
-
 config SMC91X
 	tristate "SMC 91C9x/91C1xxx support"
 	select CRC32
@@ -755,18 +740,6 @@ config NET_VENDOR_RACAL
 	  the questions about NI cards. If you say Y, you will be asked for
 	  your specific card in the following questions.
 
-config NI5010
-	tristate "NI5010 support (EXPERIMENTAL)"
-	depends on NET_VENDOR_RACAL && ISA && EXPERIMENTAL && BROKEN_ON_SMP
-	---help---
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>. Note that this is still
-	  experimental code.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called ni5010.
-
 config DNET
 	tristate "Dave ethernet support (DNET)"
 	depends on NET_ETHERNET && HAS_IOMEM
@@ -780,18 +753,6 @@ config DNET
 
 source "drivers/net/tulip/Kconfig"
 
-config AT1700
-	tristate "AT1700/1720 support (EXPERIMENTAL)"
-	depends on (ISA || MCA_LEGACY) && EXPERIMENTAL
-	select CRC32
-	---help---
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called at1700.
-
 config HP100
 	tristate "HP 10/100VG PCLAN (ISA, EISA, PCI) support"
 	depends on ISA || EISA || PCI
@@ -820,43 +781,6 @@ config NET_ISA
 	  the remaining ISA network card questions. If you say Y, you will be
 	  asked for your specific card in the following questions.
 
-config ETH16I
-	tristate "ICL EtherTeam 16i/32 support"
-	depends on NET_ISA
-	help
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called eth16i.
-
-config SEEQ8005
-	tristate "SEEQ8005 support (EXPERIMENTAL)"
-	depends on NET_ISA && EXPERIMENTAL
-	help
-	  This is a driver for the SEEQ 8005 network (Ethernet) card.  If this
-	  is for you, read the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called seeq8005.
-
-config IBMLANA
-	tristate "IBM LAN Adapter/A support"
-	depends on MCA
-	---help---
-	  This is a Micro Channel Ethernet adapter.  You need to set
-	  CONFIG_MCA to use this driver.  It is both available as an in-kernel
-	  driver and as a module.
-
-	  To compile this driver as a module, choose M here. The only
-	  currently supported card is the IBM LAN Adapter/A for Ethernet.  It
-	  will both support 16K and 32K memory windows, however a 32K window
-	  gives a better security against packet losses.  Usage of multiple
-	  boards with this driver should be possible, but has not been tested
-	  up to now due to lack of hardware.
-
 config IBMVETH
 	tristate "IBM LAN Virtual Ethernet support"
 	depends on PPC_PSERIES
drivers/net/Makefile +0 -5
index 790bb6c..3182544 100644
@@ -111,10 +111,8 @@ obj-$(CONFIG_STMMAC_ETH) += stmmac/
 obj-$(CONFIG_SUNDANCE) += sundance.o
 obj-$(CONFIG_HAMACHI) += hamachi.o
 obj-$(CONFIG_NET) += Space.o loopback.o
-obj-$(CONFIG_SEEQ8005) += seeq8005.o
 obj-$(CONFIG_NET_SB1000) += sb1000.o
 obj-$(CONFIG_HP100) += hp100.o
-obj-$(CONFIG_SMC9194) += smc9194.o
 obj-$(CONFIG_FEC) += fec.o
 obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx.o
 ifeq ($(CONFIG_FEC_MPC52xx_MDIO),y)
@@ -156,8 +154,6 @@ obj-$(CONFIG_MACVLAN) += macvlan.o
 obj-$(CONFIG_MACVTAP) += macvtap.o
 obj-$(CONFIG_SGISEEQ) += sgiseeq.o
 obj-$(CONFIG_SGI_O2MACE_ETH) += meth.o
-obj-$(CONFIG_AT1700) += at1700.o
-obj-$(CONFIG_IBMLANA) += ibmlana.o
 obj-$(CONFIG_8139CP) += 8139cp.o
 obj-$(CONFIG_8139TOO) += 8139too.o
 obj-$(CONFIG_CPMAC) += cpmac.o
@@ -165,7 +161,6 @@ obj-$(CONFIG_ATP) += atp.o
 obj-$(CONFIG_NI5010) += ni5010.o
 obj-$(CONFIG_SC92031) += sc92031.o
 
-obj-$(CONFIG_ETH16I) += eth16i.o
 obj-$(CONFIG_EQUALIZER) += eql.o
 obj-$(CONFIG_KORINA) += korina.o
 obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o
drivers/net/legacy/Kconfig +76 -0

85 lines not on this page · raw message

drivers/net/legacy/Makefile +5 -0
index 5341a1d..0268706 100644
@@ -70,3 +70,8 @@ obj-$(CONFIG_ZORRO8390) += zorro8390.o 8390.o
 # Other random one-off cards
 obj-$(CONFIG_EL3) += 3c509.o
 obj-$(CONFIG_3C515) += 3c515.o
+obj-$(CONFIG_SEEQ8005) += seeq8005.o
+obj-$(CONFIG_AT1700) += at1700.o
+obj-$(CONFIG_IBMLANA) += ibmlana.o
+obj-$(CONFIG_ETH16I) += eth16i.o
+obj-$(CONFIG_SMC9194) += smc9194.o
drivers/net/legacy/at1700.c renamed from drivers/net/at1700.c +0 -0
similarity index 100%
rename from drivers/net/at1700.c
rename to drivers/net/legacy/at1700.c
drivers/net/legacy/eth16i.c renamed from drivers/net/eth16i.c +0 -0
similarity index 100%
rename from drivers/net/eth16i.c
rename to drivers/net/legacy/eth16i.c
drivers/net/legacy/ibmlana.c renamed from drivers/net/ibmlana.c +0 -0
similarity index 100%
rename from drivers/net/ibmlana.c
rename to drivers/net/legacy/ibmlana.c
drivers/net/legacy/ibmlana.h renamed from drivers/net/ibmlana.h +0 -0
similarity index 100%
rename from drivers/net/ibmlana.h
rename to drivers/net/legacy/ibmlana.h
drivers/net/legacy/ni5010.c renamed from drivers/net/ni5010.c +0 -0
similarity index 100%
rename from drivers/net/ni5010.c
rename to drivers/net/legacy/ni5010.c
drivers/net/legacy/ni5010.h renamed from drivers/net/ni5010.h +0 -0
similarity index 100%
rename from drivers/net/ni5010.h
rename to drivers/net/legacy/ni5010.h
drivers/net/legacy/seeq8005.c renamed from drivers/net/seeq8005.c +0 -0
similarity index 100%
rename from drivers/net/seeq8005.c
rename to drivers/net/legacy/seeq8005.c
drivers/net/legacy/seeq8005.h renamed from drivers/net/seeq8005.h +0 -0
similarity index 100%
rename from drivers/net/seeq8005.h
rename to drivers/net/legacy/seeq8005.h
drivers/net/legacy/smc9194.c renamed from drivers/net/smc9194.c +0 -0
similarity index 100%
rename from drivers/net/smc9194.c
rename to drivers/net/legacy/smc9194.c
drivers/net/legacy/smc9194.h renamed from drivers/net/smc9194.h +0 -0
similarity index 100%
rename from drivers/net/smc9194.h
rename to drivers/net/legacy/smc9194.h
Signature · 1 line
1.7.3.2.146.g2d444
#20 lore raw

PATCH 11/15 netdev: kill off the concept of NET_VENDOR_FOO

In reply to Paul Gortmaker

Back when all the Kconfig options were in one flat list, there were vendor specific Kconfig options which did nothing other than hide or display the list of vendor specific Kconfig options.

With all the old driver options all squirreled away in the legacy dir, we can simply drop these in place of the single new option NETDEVICES_LEGACY.

---
 drivers/net/Kconfig        |   43 ++-----------------------------------------
 drivers/net/legacy/Kconfig |   22 +++++++++++-----------
 2 files changed, 13 insertions(+), 52 deletions(-)
drivers/net/Kconfig +2 -41
index b5adf52..7a0912e 100644
@@ -466,22 +466,9 @@ config SUNVNET
 	help
 	  Support for virtual network devices under Sun Logical Domains.
 
-config NET_VENDOR_3COM
-	bool "3COM cards"
-	depends on ISA || EISA || MCA || PCI
-	help
-	  If you have a network (Ethernet) card belonging to this class, say Y
-	  and read the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  Note that the answer to this question doesn't directly affect the
-	  kernel: saying N will just cause the configurator to skip all
-	  the questions about 3COM cards. If you say Y, you will be asked for
-	  your specific card in the following questions.
-
 config VORTEX
 	tristate "3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" support"
-	depends on NET_VENDOR_3COM && (PCI || EISA)
+	depends on (PCI || EISA)
 	select MII
 	---help---
 	  This option enables driver support for a large number of 10Mbps and
@@ -503,7 +490,7 @@ config VORTEX
 
 config TYPHOON
 	tristate "3cr990 series \"Typhoon\" support"
-	depends on NET_VENDOR_3COM && PCI
+	depends on PCI
 	select CRC32
 	---help---
 	  This option enables driver support for the 3cr990 series of cards:
@@ -519,19 +506,6 @@ config TYPHOON
 	  To compile this driver as a module, choose M here. The module
 	  will be called typhoon.
 
-config NET_VENDOR_SMC
-	bool "Western Digital/SMC cards"
-	depends on ISA || MCA || EISA || MAC
-	help
-	  If you have a network (Ethernet) card belonging to this class, say Y
-	  and read the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  Note that the answer to this question doesn't directly affect the
-	  kernel: saying N will just cause the configurator to skip all
-	  the questions about Western Digital cards. If you say Y, you will be
-	  asked for your specific card in the following questions.
-
 config BFIN_MAC
 	tristate "Blackfin on-chip MAC support"
 	depends on NET_ETHERNET && (BF516 || BF518 || BF526 || BF527 || BF536 || BF537)
@@ -727,19 +701,6 @@ config SMSC911X
 	  <file:Documentation/networking/net-modules.txt>. The module
 	  will be called smsc911x.
 
-config NET_VENDOR_RACAL
-	bool "Racal-Interlan (Micom) NI cards"
-	depends on ISA
-	help
-	  If you have a network (Ethernet) card belonging to this class, such
-	  as the NI5010, NI5210 or NI6210, say Y and read the Ethernet-HOWTO,
-	  available from <http://www.tldp.org/docs.html#howto>.
-
-	  Note that the answer to this question doesn't directly affect the
-	  kernel: saying N will just cause the configurator to skip all
-	  the questions about NI cards. If you say Y, you will be asked for
-	  your specific card in the following questions.
-
 config DNET
 	tristate "Dave ethernet support (DNET)"
 	depends on NET_ETHERNET && HAS_IOMEM
drivers/net/legacy/Kconfig +11 -11
index 2da3ac7..96d667e 100644
@@ -3,7 +3,7 @@
 
 config EL1
 	tristate "3c501 \"EtherLink\" support"
-	depends on NET_VENDOR_3COM && ISA
+	depends on ISA
 	---help---
 	  If you have a network (Ethernet) card of this type, say Y and read
 	  the Ethernet-HOWTO, available from
@@ -17,7 +17,7 @@ config EL1
 
 config EL3
 	tristate "3c509/3c529 (MCA)/3c579 \"EtherLink III\" support"
-	depends on NET_VENDOR_3COM && (ISA || EISA || MCA)
+	depends on (ISA || EISA || MCA)
 	---help---
 	  If you have a network (Ethernet) card belonging to the 3Com
 	  EtherLinkIII series, say Y and read the Ethernet-HOWTO, available
@@ -32,7 +32,7 @@ config EL3
 
 config 3C515
 	tristate "3c515 ISA \"Fast EtherLink\""
-	depends on NET_VENDOR_3COM && (ISA || EISA) && ISA_DMA_API
+	depends on (ISA || EISA) && ISA_DMA_API
 	help
 	  If you have a 3Com ISA EtherLink XL "Corkscrew" 3c515 Fast Ethernet
 	  network card, say Y and read the Ethernet-HOWTO, available from
@@ -190,7 +190,7 @@ config SNI_82596
 
 config ELPLUS
 	tristate "3c505 \"EtherLink Plus\" support"
-	depends on NET_VENDOR_3COM && ISA && ISA_DMA_API
+	depends on ISA && ISA_DMA_API
 	---help---
 	  Information about this network (Ethernet) card can be found in
 	  <file:Documentation/networking/3c505.txt>.  If you have a card of
@@ -202,7 +202,7 @@ config ELPLUS
 
 config EL16
 	tristate "3c507 \"EtherLink 16\" support (EXPERIMENTAL)"
-	depends on NET_VENDOR_3COM && ISA && EXPERIMENTAL
+	depends on ISA && EXPERIMENTAL
 	help
 	  If you have a network (Ethernet) card of this type, say Y and read
 	  the Ethernet-HOWTO, available from
@@ -213,7 +213,7 @@ config EL16
 
 config ELMC
 	tristate "3c523 \"EtherLink/MC\" support"
-	depends on NET_VENDOR_3COM && MCA_LEGACY
+	depends on MCA_LEGACY
 	help
 	  If you have a network (Ethernet) card of this type, say Y and read
 	  the Ethernet-HOWTO, available from
@@ -224,7 +224,7 @@ config ELMC
 
 config ELMC_II
 	tristate "3c527 \"EtherLink/MC 32\" support (EXPERIMENTAL)"
-	depends on NET_VENDOR_3COM && MCA && MCA_LEGACY
+	depends on MCA && MCA_LEGACY
 	help
 	  If you have a network (Ethernet) card of this type, say Y and read
 	  the Ethernet-HOWTO, available from
@@ -280,7 +280,7 @@ config ZNET
 
 config NI5010
 	tristate "NI5010 support (EXPERIMENTAL)"
-	depends on NET_VENDOR_RACAL && ISA && EXPERIMENTAL && BROKEN_ON_SMP
+	depends on ISA && EXPERIMENTAL && BROKEN_ON_SMP
 	---help---
 	  If you have a network (Ethernet) card of this type, say Y and read
 	  the Ethernet-HOWTO, available from
@@ -292,7 +292,7 @@ config NI5010
 
 config NI52
 	tristate "NI5210 support"
-	depends on NET_VENDOR_RACAL && ISA
+	depends on ISA
 	help
 	  If you have a network (Ethernet) card of this type, say Y and read
 	  the Ethernet-HOWTO, available from
@@ -303,7 +303,7 @@ config NI52
 
 config NI65
 	tristate "NI6510 support"
-	depends on NET_VENDOR_RACAL && ISA && ISA_DMA_API
+	depends on ISA && ISA_DMA_API
 	help
 	  If you have a network (Ethernet) card of this type, say Y and read
 	  the Ethernet-HOWTO, available from
@@ -637,7 +637,7 @@ config IBMLANA
 
 config SMC9194
 	tristate "SMC 9194 support"
-	depends on NET_VENDOR_SMC && (ISA || MAC && BROKEN)
+	depends on ISA || MAC && BROKEN
 	select CRC32
 	---help---
 	  This is support for the SMC9xxx based Ethernet cards. Choose this
Signature · 1 line
1.7.3.2.146.g2d444
#21 lore raw

PATCH 12/15 netdev: relocate sb1000 ISA cable modem driver to legacy

In reply to Paul Gortmaker

As yet another ISA device, this board is limited to being used in motherboards that are 10+ years old. Hence relocate it to the legacy dir.

---
 drivers/net/Kconfig               |   24 ------------------------
 drivers/net/Makefile              |    1 -
 drivers/net/legacy/Kconfig        |   24 ++++++++++++++++++++++++
 drivers/net/legacy/Makefile       |    1 +
 drivers/net/{ => legacy}/sb1000.c |    0
 5 files changed, 25 insertions(+), 25 deletions(-)
 rename drivers/net/{ => legacy}/sb1000.c (100%)
drivers/net/Kconfig +0 -24
index 7a0912e..707c9f8c 100644
@@ -168,30 +168,6 @@ config VETH
 	  When one end receives the packet it appears on its pair and vice
 	  versa.
 
-config NET_SB1000
-	tristate "General Instruments Surfboard 1000"
-	depends on PNP
-	---help---
-	  This is a driver for the General Instrument (also known as
-	  NextLevel) SURFboard 1000 internal
-	  cable modem. This is an ISA card which is used by a number of cable
-	  TV companies to provide cable modem access. It's a one-way
-	  downstream-only cable modem, meaning that your upstream net link is
-	  provided by your regular phone modem.
-
-	  At present this driver only compiles as a module, so say M here if
-	  you have this card. The module will be called sb1000. Then read
-	  <file:Documentation/networking/README.sb1000> for information on how
-	  to use this module, as it needs special ppp scripts for establishing
-	  a connection. Further documentation and the necessary scripts can be
-	  found at:
-
-	  <http://www.jacksonville.net/~fventuri/>
-	  <http://home.adelphia.net/~siglercm/sb1000.html>
-	  <http://linuxpower.cx/~cable/>
-
-	  If you don't have this card, of course say N.
-
 source "drivers/net/arcnet/Kconfig"
 
 config MII
drivers/net/Makefile +0 -1
index 3182544..ff138b0 100644
@@ -111,7 +111,6 @@ obj-$(CONFIG_STMMAC_ETH) += stmmac/
 obj-$(CONFIG_SUNDANCE) += sundance.o
 obj-$(CONFIG_HAMACHI) += hamachi.o
 obj-$(CONFIG_NET) += Space.o loopback.o
-obj-$(CONFIG_NET_SB1000) += sb1000.o
 obj-$(CONFIG_HP100) += hp100.o
 obj-$(CONFIG_FEC) += fec.o
 obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx.o
drivers/net/legacy/Kconfig +24 -0
index 96d667e..b9ea8ed 100644
@@ -649,3 +649,27 @@ config SMC9194
 
 	  To compile this driver as a module, choose M here. The module
 	  will be called smc9194.
+
+config NET_SB1000
+	tristate "General Instruments Surfboard 1000"
+	depends on PNP
+	---help---
+	  This is a driver for the General Instrument (also known as
+	  NextLevel) SURFboard 1000 internal
+	  cable modem. This is an ISA card which is used by a number of cable
+	  TV companies to provide cable modem access. It's a one-way
+	  downstream-only cable modem, meaning that your upstream net link is
+	  provided by your regular phone modem.
+
+	  At present this driver only compiles as a module, so say M here if
+	  you have this card. The module will be called sb1000. Then read
+	  <file:Documentation/networking/README.sb1000> for information on how
+	  to use this module, as it needs special ppp scripts for establishing
+	  a connection. Further documentation and the necessary scripts can be
+	  found at:
+
+	  <http://www.jacksonville.net/~fventuri/>
+	  <http://home.adelphia.net/~siglercm/sb1000.html>
+	  <http://linuxpower.cx/~cable/>
+
+	  If you don't have this card, of course say N.
drivers/net/legacy/Makefile +1 -0
index 0268706..b703327 100644
@@ -75,3 +75,4 @@ obj-$(CONFIG_AT1700) += at1700.o
 obj-$(CONFIG_IBMLANA) += ibmlana.o
 obj-$(CONFIG_ETH16I) += eth16i.o
 obj-$(CONFIG_SMC9194) += smc9194.o
+obj-$(CONFIG_NET_SB1000) += sb1000.o
drivers/net/legacy/sb1000.c renamed from drivers/net/sb1000.c +0 -0
similarity index 100%
rename from drivers/net/sb1000.c
rename to drivers/net/legacy/sb1000.c
Signature · 1 line
1.7.3.2.146.g2d444
#22 lore raw

PATCH 13/15 netdev: kill off NET_ISA Kconfig option

In reply to Paul Gortmaker

The NET_ISA option was like the NET_VENDOR_<xyz> options in that it just hid a bunch of config options from being presented. For those drivers that depended on it to provide the ISA dependency, just have them depend on ISA directly.

The NETDEV_LEGACY option is used to hide all these NET_ISA options, so that the end number of options presented is largely unchanged.

---
 drivers/net/Kconfig        |   17 -----------------
 drivers/net/legacy/Kconfig |   22 +++++++++++-----------
 2 files changed, 11 insertions(+), 28 deletions(-)
drivers/net/Kconfig +0 -17
index 707c9f8c..0433c35 100644
@@ -701,23 +701,6 @@ config HP100
 	  To compile this driver as a module, choose M here. The module
 	  will be called hp100.
 
-config NET_ISA
-	bool "Other ISA cards"
-	depends on ISA
-	---help---
-	  If your network (Ethernet) card hasn't been mentioned yet and its
-	  bus system (that's the way the cards talks to the other components
-	  of your computer) is ISA (as opposed to EISA, VLB or PCI), say Y.
-	  Make sure you know the name of your card. Read the Ethernet-HOWTO,
-	  available from <http://www.tldp.org/docs.html#howto>.
-
-	  If unsure, say Y.
-
-	  Note that the answer to this question doesn't directly affect the
-	  kernel: saying N will just cause the configurator to skip all
-	  the remaining ISA network card questions. If you say Y, you will be
-	  asked for your specific card in the following questions.
-
 config IBMVETH
 	tristate "IBM LAN Virtual Ethernet support"
 	depends on PPC_PSERIES
drivers/net/legacy/Kconfig +11 -11
index b9ea8ed..5736338 100644
@@ -108,7 +108,7 @@ config DEPCA
 
 config EWRK3
 	tristate "EtherWORKS 3 (DE203, DE204, DE205) support"
-	depends on NET_ISA
+	depends on ISA
 	select CRC32
 	---help---
 	  This driver supports the DE203, DE204 and DE205 network (Ethernet)
@@ -235,7 +235,7 @@ config ELMC_II
 
 config EEXPRESS
 	tristate "EtherExpress 16 support"
-	depends on NET_ISA
+	depends on ISA
 	---help---
 	  If you have an EtherExpress16 network (Ethernet) card, say Y and
 	  read the Ethernet-HOWTO, available from
@@ -249,7 +249,7 @@ config EEXPRESS
 
 config EEXPRESS_PRO
 	tristate "EtherExpressPro support/EtherExpress 10 (i82595) support"
-	depends on NET_ISA
+	depends on ISA
 	---help---
 	  If you have a network (Ethernet) card of this type, say Y. This
 	  driver supports Intel i82595{FX,TX} based boards. Note however
@@ -262,7 +262,7 @@ config EEXPRESS_PRO
 
 config LP486E
 	tristate "LP486E on board Ethernet"
-	depends on NET_ISA
+	depends on ISA
 	help
 	  Say Y here to support the 82596-based on-board Ethernet controller
 	  for the Panther motherboard, which is one of the two shipped in the
@@ -270,7 +270,7 @@ config LP486E
 
 config ZNET
 	tristate "Zenith Z-Note support (EXPERIMENTAL)"
-	depends on NET_ISA && EXPERIMENTAL && ISA_DMA_API
+	depends on ISA && EXPERIMENTAL && ISA_DMA_API
 	help
 	  The Zenith Z-Note notebook computer has a built-in network
 	  (Ethernet) card, and this is the Linux driver for it. Note that the
@@ -501,7 +501,7 @@ config ULTRA32
 
 config E2100
 	tristate "Cabletron E21xx support"
-	depends on NET_ISA
+	depends on ISA
 	select CRC32
 	help
 	  If you have a network (Ethernet) card of this type, say Y and read
@@ -513,7 +513,7 @@ config E2100
 
 config HPLAN_PLUS
 	tristate "HP PCLAN+ (27247B and 27252A) support"
-	depends on NET_ISA
+	depends on ISA
 	select CRC32
 	help
 	  If you have a network (Ethernet) card of this type, say Y and read
@@ -525,7 +525,7 @@ config HPLAN_PLUS
 
 config HPLAN
 	tristate "HP PCLAN (27245 and other 27xxx series) support"
-	depends on NET_ISA
+	depends on ISA
 	select CRC32
 	help
 	  If you have a network (Ethernet) card of this type, say Y and read
@@ -537,7 +537,7 @@ config HPLAN
 
 config NE2000
 	tristate "NE2000/NE1000 support"
-	depends on NET_ISA || (Q40 && m) || M32R || MACH_TX49XX
+	depends on ISA || (Q40 && m) || M32R || MACH_TX49XX
 	select CRC32
 	---help---
 	  If you have a network (Ethernet) card of this type, say Y and read
@@ -600,7 +600,7 @@ config AT1700
 
 config ETH16I
 	tristate "ICL EtherTeam 16i/32 support"
-	depends on NET_ISA
+	depends on ISA
 	help
 	  If you have a network (Ethernet) card of this type, say Y and read
 	  the Ethernet-HOWTO, available from
@@ -611,7 +611,7 @@ config ETH16I
  
 config SEEQ8005
 	tristate "SEEQ8005 support (EXPERIMENTAL)"
-	depends on NET_ISA && EXPERIMENTAL
+	depends on ISA && EXPERIMENTAL
 	help
 	  This is a driver for the SEEQ 8005 network (Ethernet) card.  If this
 	  is for you, read the Ethernet-HOWTO, available from
Signature · 1 line
1.7.3.2.146.g2d444
#23 lore raw

PATCH 14/15 MAINTAINERS: updates for new drivers/net/legacy dir

In reply to Paul Gortmaker

Some drivers, particularly those which are greater than 10 years old, have been moved off to a new legacy directory. Update the MAINTAINERS file to indicate this new path.

For the 8390 based drivers, change the status from maintained to obsolete and remove the old e-mail address.

---
 MAINTAINERS |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)
MAINTAINERS +9 -10
index 69aa8fe..5d499d1 100644
@@ -116,7 +116,7 @@ Maintainers List (try to look for most precise areas first)
 M:	Philip Blundell <[email protected]>
 L:	[email protected]
 S:	Maintained
-F:	drivers/net/3c505*
+F:	drivers/net/legacy/3c505*
 
 3C59X NETWORK DRIVER
 M:	Steffen Klassert <[email protected]>
@@ -166,11 +166,10 @@ F:	drivers/serial/8250*
 F:	include/linux/serial_8250.h
 
 8390 NETWORK DRIVERS [WD80x3/SMC-ELITE, SMC-ULTRA, NE2000, 3C503, etc.]
-M:	Paul Gortmaker <[email protected]>
 L:	[email protected]
-S:	Maintained
-F:	drivers/net/*8390*
-F:	drivers/net/ax88796.c
+S:	Obsolete
+F:	drivers/net/legacy/*8390*
+F:	drivers/net/legacy/ax88796.c
 
 9P FILE SYSTEM
 M:	Eric Van Hensbergen <[email protected]>
@@ -1945,7 +1944,7 @@ F:	net/decnet/
 DEFXX FDDI NETWORK DRIVER
 M:	"Maciej W. Rozycki" <[email protected]>
 S:	Maintained
-F:	drivers/net/defxx.*
+F:	drivers/net/legacy/defxx.*
 
 DELL LAPTOP DRIVER
 M:	Matthew Garrett <[email protected]>
@@ -2326,7 +2325,7 @@ ETHEREXPRESS-16 NETWORK DRIVER
 M:	Philip Blundell <[email protected]>
 L:	[email protected]
 S:	Maintained
-F:	drivers/net/eexpress.*
+F:	drivers/net/legacy/eexpress.*
 
 ETHERNET BRIDGE
 M:	Stephen Hemminger <[email protected]>
@@ -2340,7 +2339,7 @@ F:	net/bridge/
 ETHERTEAM 16I DRIVER
 M:	Mika Kuoppala <[email protected]>
 S:	Maintained
-F:	drivers/net/eth16i.c
+F:	drivers/net/legacy/eth16i.c
 
 EXT2 FILE SYSTEM
 M:	Jan Kara <[email protected]>
@@ -4232,7 +4231,7 @@ M:	Jan-Pascal van Best <[email protected]>
 M:	Andreas Mohr <[email protected]>
 L:	[email protected]
 S:	Maintained
-F:	drivers/net/ni5010.*
+F:	drivers/net/legacy/ni5010.*
 
 NILFS2 FILESYSTEM
 M:	KONISHI Ryusuke <[email protected]>
@@ -5975,7 +5974,7 @@ W:	http://uclinux-h8.sourceforge.jp/
 S:	Supported
 F:	arch/h8300/
 F:	drivers/ide/ide-h8300.c
-F:	drivers/net/ne-h8300.c
+F:	drivers/net/legacy/ne-h8300.c
 
 UDF FILESYSTEM
 M:	Jan Kara <[email protected]>
Signature · 1 line
1.7.3.2.146.g2d444
#24 lore raw

PATCH 15/15 netdev: relocate LICENSE.SRC to legacy

In reply to Paul Gortmaker

A grep for "..GNU General Public License as modified by SRC.." shows that this license file only applies to some of the earliest drivers added ~15 years ago. Since all these drivers are now in the legacy dir, the license might as well be too.

---
 drivers/net/{ => legacy}/LICENSE.SRC |    0
 1 files changed, 0 insertions(+), 0 deletions(-)
 rename drivers/net/{ => legacy}/LICENSE.SRC (100%)
drivers/net/legacy/LICENSE.SRC renamed from drivers/net/LICENSE.SRC +0 -0
similarity index 100%
rename from drivers/net/LICENSE.SRC
rename to drivers/net/legacy/LICENSE.SRC
Signature · 1 line
1.7.3.2.146.g2d444
#25 lore raw
In reply to Paul Gortmaker
Quoted 4 lines · Paul Gortmaker

The drivers/net dir has a lot of files - originally there were no subdirs, but at least now subdirs are being used effectively. But the original drivers from 10+ years ago are still right there at the top. This series creates a drivers/net/legacy dir.

Hi Paul.

I like this idea.

I suggest a bit of a further grouping by using a drivers/net/ethernet directory and putting those legacy drivers in a new subdirectory drivers/net/ethernet/legacy.

Quoted 5 lines

The initial target is things like ISA/EISA/MCA drivers, and with that alone, we can get close to 90 files out of drivers/net. Plus, by having a semi-defined description for legacy as being "drivers more than 10 years old" we'll always have a destination for drivers as they fall out of maintainership and use.

I think legacy is "old and not sold or used much anymore".

I believe you're not moving 3c59x as that's relatively still popular even though it's nearly 15 years old.

Or maybe that was just an oversight...

#26 lore raw
Quoted 7 lines · Joe Perches
Quoted 5 lines · Paul Gortmaker

The initial target is things like ISA/EISA/MCA drivers, and with that alone, we can get close to 90 files out of drivers/net. Plus, by having a semi-defined description for legacy as being "drivers more than 10 years old" we'll always have a destination for drivers as they fall out of maintainership and use.

Quoted 6 lines

I think legacy is "old and not sold or used much anymore".

I believe you're not moving 3c59x as that's relatively still popular even though it's nearly 15 years old.

Or maybe that was just an oversight...

The 3c59x driver also drives a few not-that-old 100MBit cards like "3Com Corporation 3c905B 100BaseTX [Cyclone] [10b7:9055] (rev 64)" and these are quite common still :)

-David

#27 lore raw
Quoted 8 lines · David Lamparter
Quoted 8 lines
Quoted 5 lines

The initial target is things like ISA/EISA/MCA drivers, and with that alone, we can get close to 90 files out of drivers/net. Plus, by having a semi-defined description for legacy as being "drivers more than 10 years old" we'll always have a destination for drivers as they fall out of maintainership and use.

I think legacy is "old and not sold or used much anymore".

Quoted 8 lines
Quoted 4 lines

I believe you're not moving 3c59x as that's relatively still popular even though it's nearly 15 years old.

Or maybe that was just an oversight...

The 3c59x driver also drives a few not-that-old 100MBit cards like "3Com Corporation 3c905B 100BaseTX [Cyclone] [10b7:9055] (rev 64)" and these are quite common still :)

What's the difference? -- that's a change of the name only you should be
proud of! ;)

I have seen plenty of these Vortex/Boomerang/Cyclone cards in various
configurations and still have a couple myself, but I fail to recall any that would be less than 8 years old, which is about the age of my newest FDDI stuff (updated by the manufacturer to universal PCI and HP-branded because of the DEC/Compaq acquisition) which has been declared "obviously obsolete", so why shouldn't this equipment be either? ;)

Maciej

#28 lore raw
In reply to Joe Perches
Quoted 6 lines · Joe Perches
Quoted 4 lines · Paul Gortmaker

The drivers/net dir has a lot of files - originally there were no subdirs, but at least now subdirs are being used effectively. But the original drivers from 10+ years ago are still right there at the top. This series creates a drivers/net/legacy dir.

Quoted 8 lines

Hi Paul.

I like this idea.

I suggest a bit of a further grouping by using a drivers/net/ethernet directory and putting those legacy drivers in a new subdirectory drivers/net/ethernet/legacy.

That is a substantially larger change, since you'd now be relocating nearly every remaining driver, i.e. all the relatively modern 100M and GigE drivers. Plus what do you do with the sb1000 - create drivers/cablemodem/legacy just for one file? Or the ethernet drivers already in existing subdirs, like arm and pcmcia -- do we move those?

With this, I tried to aim for a significant gain (close to 1/3 less files) within what I felt was a reasonable sized change set that had a chance of getting an overall OK from folks. Giant "flag-day" type mammoth changesets are a PITA for all.

Quoted 8 lines
Quoted 6 lines

The initial target is things like ISA/EISA/MCA drivers, and with that alone, we can get close to 90 files out of drivers/net. Plus, by having a semi-defined description for legacy as being "drivers more than 10 years old" we'll always have a destination for drivers as they fall out of maintainership and use.

I think legacy is "old and not sold or used much anymore".

I tried to stick to having both, ie. old + not used much,
in what I chose for my initial group. Where "old" is
meant to apply to the hardware, and not to the driver.

Quoted 5 lines

I believe you're not moving 3c59x as that's relatively still popular even though it's nearly 15 years old.

Or maybe that was just an oversight...

I didn't want to include any drivers in the initial group that I thought might sidetrack the issue by being contentious (clearly I was off by one) -- the point being, that once the base infrastructure and initial group of (almost) universally agreed upon ones is in, more can be discussed and added later, as appropriate.

Paul.

Quoted 3 lines
#29 lore raw
Quoted 6 lines · Paul Gortmaker
Quoted 5 lines · Joe Perches
Quoted 4 lines · Paul Gortmaker

The drivers/net dir has a lot of files - originally there were no subdirs, but at least now subdirs are being used effectively. But the original drivers from 10+ years ago are still right there at the top. This series creates a drivers/net/legacy dir.

Quoted 8 lines
Quoted 5 lines

I like this idea.
I suggest a bit of a further grouping by using a drivers/net/ethernet directory and putting those legacy drivers in a new subdirectory drivers/net/ethernet/legacy.

That is a substantially larger change, since you'd now be relocating nearly every remaining driver, i.e. all the relatively modern 100M and GigE drivers.

Files to not need immediate renames.

Renames could happen when the appropriate maintainer wants to or gets coerced to conform to some new file layout standard.

I had submitted a related RFC patch:

https://patchwork.kernel.org/patch/244641/

and then had some off list discussions
with Jeff Kirsher from Intel.

Perhaps Jeff will chime in.

Quoted 3 lines

Plus what do you
do with the sb1000 - create drivers/cablemodem/legacy just for one file?

I never looked at that particular driver before.
Maybe. I don't have a strong opinion. Leaving
it where it is might be OK.

Quoted 2 lines

Or the ethernet drivers already in
existing subdirs, like arm and pcmcia -- do we move those?

Maybe. If there's no demand, there's no absolute need to move it at all. I think a reasonable goal is to have some sensible and consistent file layout scheme though.

There are arch specific directories under various drivers/... so I don't see a need to move directories like drivers/net/arm or drivers/s390.

Quoted 4 lines

With this, I tried to aim for a significant gain (close to 1/3 less files) within what I felt was a reasonable sized change set that had a chance of getting an overall OK from folks. Giant "flag-day" type mammoth changesets are a PITA for all.

I believe there's no need for a flag-day. File renames could happen gradually or not at all.

#30 lore raw
Quoted 7 lines · Joe Perches
Quoted 6 lines · Paul Gortmaker
Quoted 5 lines · Joe Perches
Quoted 4 lines · Paul Gortmaker

The drivers/net dir has a lot of files - originally there were no subdirs, but at least now subdirs are being used effectively. But the original drivers from 10+ years ago are still right there at the top. This series creates a drivers/net/legacy dir.

Quoted 9 lines
Quoted 8 lines
Quoted 5 lines

I like this idea.
I suggest a bit of a further grouping by using a drivers/net/ethernet directory and putting those legacy drivers in a new subdirectory drivers/net/ethernet/legacy.

That is a substantially larger change, since you'd now be relocating nearly every remaining driver, i.e. all the relatively modern 100M and GigE drivers.

I am not particularly a fan of making a "legacy" directory and moving old drivers into it. Just because this is very subjective, if you say "drivers which are X years old and not used much" is vague and depending on who you ask would get varying results. But if you were to were to define legacy as all ISA, EISA and MCA drivers (not based on their use) would be better.

But if a legacy directory was to be made, I like Joe's suggestion of drivers/net/ethernet/legacy.

Quoted 26 lines

Files to not need immediate renames.

Renames could happen when the appropriate maintainer wants to or gets coerced to conform to some new file layout standard.

I had submitted a related RFC patch:

https://patchwork.kernel.org/patch/244641/

and then had some off list discussions
with Jeff Kirsher from Intel.

Perhaps Jeff will chime in.

Quoted 3 lines

Plus what do you
do with the sb1000 - create drivers/cablemodem/legacy just for one file?

I never looked at that particular driver before.
Maybe. I don't have a strong opinion. Leaving
it where it is might be OK.

Quoted 2 lines

Or the ethernet drivers already in
existing subdirs, like arm and pcmcia -- do we move those?

Quoted 7 lines

Maybe. If there's no demand, there's no absolute need to move it at all. I think a reasonable goal is to have some sensible and consistent file layout scheme though.

There are arch specific directories under various drivers/... so I don't see a need to move directories like drivers/net/arm or drivers/s390.

I agree with Joe.

Quoted 10 lines
Quoted 5 lines

With this, I tried to aim for a significant gain (close to 1/3 less files) within what I felt was a reasonable sized change set that had a chance of getting an overall OK from folks. Giant "flag-day" type mammoth changesets are a PITA for all.

I believe there's no need for a flag-day. File renames could happen gradually or not at all.

Again I agree with Joe.

#31 lore raw
Quoted 18 lines · Jeff Kirsher
Quoted 7 lines · Joe Perches
Quoted 6 lines · Paul Gortmaker
Quoted 5 lines · Joe Perches
Quoted 4 lines · Paul Gortmaker

The drivers/net dir has a lot of files - originally there were no subdirs, but at least now subdirs are being used effectively. But the original drivers from 10+ years ago are still right there at the top. This series creates a drivers/net/legacy dir.

Quoted 9 lines
Quoted 8 lines
Quoted 5 lines

I like this idea.
I suggest a bit of a further grouping by using a drivers/net/ethernet directory and putting those legacy drivers in a new subdirectory drivers/net/ethernet/legacy.

That is a substantially larger change, since you'd now be relocating nearly every remaining driver, i.e. all the relatively modern 100M and GigE drivers.

Quoted 6 lines

I am not particularly a fan of making a "legacy" directory and moving old drivers into it. Just because this is very subjective, if you say "drivers which are X years old and not used much" is vague and depending on who you ask would get varying results. But if you were to were to define legacy as all ISA, EISA and MCA drivers (not based on their use) would be better.

I think that being subjective can be an advantage. There may be some debate on whether X is legacy or not, but I see no harm in that. On the other hand, I see binding ourselves to concrete inflexible rules as a disadvantage.

For example, look at the sister directory, drivers/serial -- the venerable 8250 UART continues to support ISA-like mapped 0x3f8/0x2f8 PIO devices such as those on the ISA MultiIO/IDE cards first appearing in 80286 computers. But we probably don't want to shuffle that off to a legacy dir, given that nearly every embedded CPU manufacturer has a SoC 8250 UART implementation of their own, and it remains in high use.

Quoted 3 lines

But if a legacy directory was to be made, I like Joe's suggestion of drivers/net/ethernet/legacy.

If we extend that to being a rule, i.e. drivers/net/*/legacy then we'd implicitly be advocating creation of things like:

drivers/net/tokenring/legacy
drivers/net/arcnet/legacy

Yes, I do imagine you aren't suggesting we do that. :)

Quoted 31 lines
Quoted 31 lines

Files to not need immediate renames.

Renames could happen when the appropriate maintainer wants to or gets coerced to conform to some new file layout standard.

I had submitted a related RFC patch:

https://patchwork.kernel.org/patch/244641/

and then had some off list discussions
with Jeff Kirsher from Intel.

Perhaps Jeff will chime in.

Quoted 3 lines

Plus what do you
do with the sb1000 - create drivers/cablemodem/legacy just for one file?

I never looked at that particular driver before.
Maybe. I don't have a strong opinion. Leaving
it where it is might be OK.

Quoted 2 lines

Or the ethernet drivers already in
existing subdirs, like arm and pcmcia -- do we move those?

Maybe. If there's no demand, there's no absolute need to move it at all. I think a reasonable goal is to have some sensible and consistent file layout scheme though.

Quoted 5 lines
Quoted 3 lines

There are arch specific directories under various drivers/... so I don't see a need to move directories like drivers/net/arm or drivers/s390.

I agree with Joe.

I don't think there is any disagreement here on this point. Moving stuff that is already in an appropriate subdir was never part of what I was proposing with drivers/legacy.

But if we create subdirs with concrete definitions, then people will most likely be expecting all drivers that match to be in that specific subdir.

Quoted 7 lines
Quoted 7 lines
Quoted 6 lines

With this, I tried to aim for a significant gain (close to 1/3 less files) within what I felt was a reasonable sized change set that had a chance of getting an overall OK from folks. Giant "flag-day" type mammoth changesets are a PITA for all.

Quoted 6 lines
Quoted 4 lines

I believe there's no need for a flag-day. File renames could happen gradually or not at all.

Again I agree with Joe.

Sure, renames can be async, and driven by the individual maintainers of the files, but typically when conversion like events are left open ended (timewise) they tend to drag on for longer times than necessary. At least in my experience. If I had sent the RFC with one patch that amounted to a "mkdir", and no actual file moves, I wouldn't have expected much other than a bagful of scorn in return. :) Putting it to use and showing a real cleanup is where the value became really apparent, I think.

In any case, I still think this is worthwhile, and in the absence of an alternate proposal that gets a higher level of universal agreement, I'm hoping we can still do this. I've got a follow on commit ready that factors a lot of the legacy related probe code out of Space.c too.

Regardless of which way it goes, thanks for the feedback. Paul.

#32 lore raw
Quoted 26 lines · Paul Gortmaker
Quoted 18 lines · Jeff Kirsher
Quoted 7 lines · Joe Perches
Quoted 6 lines · Paul Gortmaker
Quoted 5 lines · Joe Perches
Quoted 4 lines · Paul Gortmaker

The drivers/net dir has a lot of files - originally there were no subdirs, but at least now subdirs are being used effectively. But the original drivers from 10+ years ago are still right there at the top.  This series creates a drivers/net/legacy dir.

Quoted 9 lines
Quoted 8 lines
Quoted 5 lines

I like this idea.
I suggest a bit of a further grouping by using a drivers/net/ethernet directory and putting those legacy drivers in a new subdirectory drivers/net/ethernet/legacy.

That is a substantially larger change, since you'd now be relocating nearly every remaining driver, i.e. all the relatively modern 100M and GigE drivers.

Quoted 6 lines

I am not particularly a fan of making a "legacy" directory and moving old drivers into it.  Just because this is very subjective, if you say "drivers which are X years old and not used much" is vague and depending on who you ask would get varying results.  But if you were to were to define legacy as all ISA, EISA and MCA drivers (not based on their use) would be better.

Quoted 5 lines

I think that being subjective can be an advantage.  There may be some debate on whether X is legacy or not, but I see no harm in that.  On the other hand, I see binding ourselves to concrete inflexible rules as a disadvantage.

I am not disagreeing that we need to be flexible, and to organize the directory structure in a logical way does not equate to "concrete and inflexible".

I brought the topic of organizing the /drivers/net directory up at NetConf/Plumbers and here is what came about the discussion...

Joe and I are working to organize the drivers into /drivers/net/<technology> directories and to cleanup the Kconfig to reflect the organization. Ethernet drivers will be in /drivers/net/ethernet, and so on. I brought up your suggestion to making a "legacy" directory and those present did not like the idea. In short, there is no advantage to this type of organization and having the drivers reside in their current location or in the model of /drivers/net/<technology> does not cause any problems

Quoted 56 lines

For example, look at the sister directory, drivers/serial -- the venerable 8250 UART continues to support ISA-like mapped 0x3f8/0x2f8 PIO devices such as those on the ISA MultiIO/IDE cards first appearing in 80286 computers.  But we probably don't want to shuffle that off to a legacy dir, given that nearly every embedded CPU manufacturer has a SoC 8250 UART implementation of their own, and it remains in high use.

Quoted 3 lines

But if a legacy directory was to be made, I like Joe's suggestion of drivers/net/ethernet/legacy.

If we extend that to being a rule, i.e. drivers/net/*/legacy then we'd implicitly be advocating creation of things like:

       drivers/net/tokenring/legacy
       drivers/net/arcnet/legacy

Yes, I do imagine you aren't suggesting we do that.  :)

Quoted 31 lines
Quoted 31 lines

Files to not need immediate renames.

Renames could happen when the appropriate maintainer wants to or gets coerced to conform to some new file layout standard.

I had submitted a related RFC patch:

https://patchwork.kernel.org/patch/244641/

and then had some off list discussions
with Jeff Kirsher from Intel.

Perhaps Jeff will chime in.

Quoted 3 lines

Plus what do you
do with the sb1000 - create drivers/cablemodem/legacy just for one file?

I never looked at that particular driver before.
Maybe.  I don't have a strong opinion.  Leaving
it where it is might be OK.

Quoted 2 lines

Or the ethernet drivers already in
existing subdirs, like arm and pcmcia -- do we move those?

Maybe.  If there's no demand, there's no absolute need to move it at all.  I think a reasonable goal is to have some sensible and consistent file layout scheme though.

Quoted 5 lines
Quoted 3 lines

There are arch specific directories under various drivers/... so I don't see a need to move directories like drivers/net/arm or drivers/s390.

I agree with Joe.

Quoted 7 lines

I don't think there is any disagreement here on this point. Moving stuff that is already in an appropriate subdir was never part of what I was proposing with drivers/legacy.

But if we create subdirs with concrete definitions, then people will most likely be expecting all drivers that match to be in that specific subdir.

Correct, although I would use "logical organization" versus "concrete definitions" and we are working on patches to do the clean up so that Ethernet drivers are under /drivers/net/ethernet/*, as well as the other technologies. For the drivers like vlan, 8021q, bridging, etc we will place those in /drivers/net/sw/. That is the plan at least...

Quoted 15 lines
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines

With this, I tried to aim for a significant gain (close to 1/3 less files) within what I felt was a reasonable sized change set that had a chance of getting an overall OK from folks. Giant "flag-day" type mammoth changesets are a PITA for all.

Quoted 6 lines
Quoted 4 lines

I believe there's no need for a flag-day. File renames could happen gradually or not at all.

Again I agree with Joe.

Quoted 10 lines

Sure, renames can be async, and driven by the individual maintainers of the files, but typically when conversion like events are left open ended (timewise) they tend to drag on for longer times than necessary.  At least in my experience.  If I had sent the RFC with one patch that amounted to a "mkdir", and no actual file moves, I wouldn't have expected much other than a bagful of scorn in return. :) Putting it to use and showing a real cleanup is where the value became really apparent, I think.

We are hoping not to drag this out and plan on getting this into 2.6.38 (net-next) within the couple of weeks.

Quoted 13 lines

In any case, I still think this is worthwhile, and in the absence of an alternate proposal that gets a higher level of universal agreement, I'm hoping we can still do this. I've got a follow on commit ready that factors a lot of the legacy related probe code out of Space.c too.

Regardless of which way it goes, thanks for the feedback. Paul.
--
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

Signature · 2 lines
Cheers,
Jeff
#33 lore raw
Quoted 34 lines · Jeff Kirsher
Quoted 26 lines · Paul Gortmaker
Quoted 18 lines · Jeff Kirsher
Quoted 7 lines · Joe Perches
Quoted 6 lines · Paul Gortmaker
Quoted 5 lines · Joe Perches
Quoted 4 lines · Paul Gortmaker

The drivers/net dir has a lot of files - originally there were no subdirs, but at least now subdirs are being used effectively. But the original drivers from 10+ years ago are still right there at the top. This series creates a drivers/net/legacy dir.

Quoted 9 lines
Quoted 8 lines
Quoted 5 lines

I like this idea.
I suggest a bit of a further grouping by using a drivers/net/ethernet directory and putting those legacy drivers in a new subdirectory drivers/net/ethernet/legacy.

That is a substantially larger change, since you'd now be relocating nearly every remaining driver, i.e. all the relatively modern 100M and GigE drivers.

Quoted 6 lines

I am not particularly a fan of making a "legacy" directory and moving old drivers into it. Just because this is very subjective, if you say "drivers which are X years old and not used much" is vague and depending on who you ask would get varying results. But if you were to were to define legacy as all ISA, EISA and MCA drivers (not based on their use) would be better.

Quoted 5 lines

I think that being subjective can be an advantage. There may be some debate on whether X is legacy or not, but I see no harm in that. On the other hand, I see binding ourselves to concrete inflexible rules as a disadvantage.

Quoted 6 lines

I am not disagreeing that we need to be flexible, and to organize the directory structure in a logical way does not equate to "concrete and inflexible".

I brought the topic of organizing the /drivers/net directory up at NetConf/Plumbers and here is what came about the discussion...

Thanks for the update, I wasn't aware that happened.

Quoted 6 lines

Joe and I are working to organize the drivers into /drivers/net/<technology> directories and to cleanup the Kconfig to reflect the organization. Ethernet drivers will be in /drivers/net/ethernet, and so on. I brought up your suggestion to making a "legacy" directory and those present did not like the idea.

Interesting. I would have not came to that conclusion based on the feedback on netdev@vger alone. Oh well, if that was the consensus then I'm not going to argue with it.

Quoted 3 lines

In short, there is no advantage to this type of organization and having the drivers reside in their current location or in the model of /drivers/net/<technology> does not cause any problems

[...]

Quoted 11 lines
Quoted 11 lines
Quoted 6 lines
Quoted 4 lines

There are arch specific directories under various drivers/... so I don't see a need to move directories like drivers/net/arm or drivers/s390.

I agree with Joe.

I don't think there is any disagreement here on this point. Moving stuff that is already in an appropriate subdir was never part of what I was proposing with drivers/legacy.

Quoted 7 lines
Quoted 3 lines

But if we create subdirs with concrete definitions, then people will most likely be expecting all drivers that match to be in that specific subdir.

Correct, although I would use "logical organization" versus "concrete definitions" and we are working on patches to do the clean up so that Ethernet drivers are under /drivers/net/ethernet/*, as well as the

If you do get agreement on subcategories under ethernet for one reason or another (i.e. vendor grouping), then I'd suggest using ns8390 as a grouping category - it would lend itself well to coalescing a lot of legacy drivers in itself.

Quoted 29 lines

other technologies. For the drivers like vlan, 8021q, bridging, etc we will place those in /drivers/net/sw/. That is the plan at least...

Quoted 15 lines
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines

With this, I tried to aim for a significant gain (close to 1/3 less files) within what I felt was a reasonable sized change set that had a chance of getting an overall OK from folks. Giant "flag-day" type mammoth changesets are a PITA for all.

Quoted 6 lines
Quoted 4 lines

I believe there's no need for a flag-day. File renames could happen gradually or not at all.

Again I agree with Joe.

Quoted 10 lines

Sure, renames can be async, and driven by the individual maintainers of the files, but typically when conversion like events are left open ended (timewise) they tend to drag on for longer times than necessary. At least in my experience. If I had sent the RFC with one patch that amounted to a "mkdir", and no actual file moves, I wouldn't have expected much other than a bagful of scorn in return. :) Putting it to use and showing a real cleanup is where the value became really apparent, I think.

Quoted 2 lines

We are hoping not to drag this out and plan on getting this into 2.6.38 (net-next) within the couple of weeks.

Sounds good. In the end, the one thing I was hoping to see happen was a bit more organization in drivers/net - and both solutions should be able to provide this.

Paul.

Quoted 17 lines
Quoted 14 lines

In any case, I still think this is worthwhile, and in the absence of an alternate proposal that gets a higher level of universal agreement, I'm hoping we can still do this. I've got a follow on commit ready that factors a lot of the legacy related probe code out of Space.c too.

Regardless of which way it goes, thanks for the feedback. Paul.
--
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

#34 lore raw
In reply to Jeff Kirsher
Quoted 4 lines · Jeff Kirsher

Joe and I are working to organize the drivers into /drivers/net/<technology> directories and to cleanup the Kconfig to reflect the organization. Ethernet drivers will be in /drivers/net/ethernet, and so on.

[]

Quoted 2 lines

We are hoping not to drag this out and plan on getting this into 2.6.38 (net-next) within the couple of weeks.

What is an appropriate time frame for doing these
reorganization file/directory moves for net-next?

David, do you have a preference?

#35 lore raw
Quoted 5 lines · Joe Perches
Quoted 4 lines · Jeff Kirsher

Joe and I are working to organize the drivers into /drivers/net/<technology> directories and to cleanup the Kconfig to reflect the organization. Ethernet drivers will be in /drivers/net/ethernet, and so on.

Quoted 9 lines

[]

Quoted 2 lines

We are hoping not to drag this out and plan on getting this into 2.6.38 (net-next) within the couple of weeks.

What is an appropriate time frame for doing these
reorganization file/directory moves for net-next?

David, do you have a preference?

I am almost ~50% done with the patch, I am hoping to get the patch out this weekend. I have been testing as I go to ensure that there are no breakages,that has been the reason for the delay.

A message that is not in the archive (sent off-list or not yet received): [email protected]

#37 lore raw

[adding missing cc:netdev]

A few comments, since I have just been made aware of the Netconf slides,

Quoted 4 lines · Paul Gortmaker

If in fact this series gets agreement, I'm figuring it makes sense to have it go in either at the beginning of a dev cycle, or at the very end

I think I have seen git properly coping with renames, if your and other developers' branches are git-merged (patchwise application of course leads to rejects).

Quoted 3 lines

classifying drivers according to the physical layer they support or if multiple are, such as with the Ethernet that is backwards compatible, the newest variation they do?

Above all I would probably like to see

- getting rid of the "1000 Mbit" and "10000 Mbit" submenus. jme.ko for example is put under 1000 Mbit, but the jme chip I have ("197b:0260 (rev
02) JMicron Technology Corp. JMC260 PCI Express Fast Ethernet Controller") does not do 1000.

- getting rid of CONFIG_NET_PCI and move dependencies to individual driver config options. It looks odd that only drivers from the 10/100 Mbit category — and then, not even all — depend on this. Of course you probably won't see Gbit adapters for ISA, but SUN, 3com, HP cards are also available on PCI.

Jeff Kirsher puts forward in:

Quoted 4 lines

http://vger.kernel.org/netconf2010_slides/netconf-jtk.pdf

Create /drivers/net/sw for vlan, 8021q, bonding, bridging, etc drivers

That does not seem too nice. Currently, bridge is at net/bridge/, and moving it into drivers/net/sw/bridge/ is just elongating the path name for a rename that is.. a bit disputable as far as I read the thread.

What is in net/, leave it there for now.
drivers/net/ethernet/, I am fine with.

#38 lore raw
Quoted 21 lines · Jan Engelhardt

[adding missing cc:netdev]

A few comments, since I have just been made aware of the Netconf slides,

Quoted 4 lines · Paul Gortmaker

If in fact this series gets agreement, I'm figuring it makes sense to have it go in either at the beginning of a dev cycle, or at the very end

I think I have seen git properly coping with renames, if your and other developers' branches are git-merged (patchwise application of course leads to rejects).

Quoted 3 lines

classifying drivers according to the physical layer they support or if multiple are, such as with the Ethernet that is backwards compatible, the newest variation they do?

Quoted 6 lines

Above all I would probably like to see

- getting rid of the "1000 Mbit" and "10000 Mbit" submenus. jme.ko for example is put under 1000 Mbit, but the jme chip I have ("197b:0260 (rev
02) JMicron Technology Corp. JMC260 PCI Express Fast Ethernet Controller") does not do 1000.

Organization of the Kconfig menus/sub-menus is also goal in this organization of /drivers/net. I like the 10/100, 1000, and 10GbE sub-menus, but if we find that there are issues with drivers that support hardware in more than one category, then we should look at the best way to handle those drivers or organization of the Ethernet sub-menus.

Quoted 6 lines

- getting rid of CONFIG_NET_PCI and move dependencies to individual driver config options. It looks odd that only drivers from the 10/100 Mbit category — and then, not even all — depend on this. Of course you probably won't see Gbit adapters for ISA, but SUN, 3com, HP cards are also available on PCI.

Agreed, this is fixed in some of the preliminary patches that Joe and I have been working on.

Quoted 10 lines

Jeff Kirsher puts forward in:

Quoted 4 lines

http://vger.kernel.org/netconf2010_slides/netconf-jtk.pdf

Create /drivers/net/sw for vlan, 8021q, bonding, bridging, etc drivers

That does not seem too nice. Currently, bridge is at net/bridge/, and moving it into drivers/net/sw/bridge/ is just elongating the path name for a rename that is.. a bit disputable as far as I read the thread.

The reasoning behind this idea was that we are trying to organize /drivers/net so that we have /drivers/net/<L2 technologies> for example:
/drivers/net/appletalk
/drivers/net/arcnet
/drivers/net/ethernet
/drivers/net/tokenring
/drivers/net/wimax
/drivers/net/wireless

Stack drivers like vlan, bonding, bridging do not fall into this and so we thought it best to create a /drivers/net/sw directory for stack drivers like this. For now, we planned on keeping stack drivers in /drivers/net/. IMHO I still think that moving stack drivers to /drivers/net/sw is still a good idea but it does not have to happen right away.

Quoted 3 lines

What is in net/, leave it there for now.
drivers/net/ethernet/, I am fine with.

Most of the drivers in /drivers/net are Ethernet drivers and should reside in /drivers/net/ethernet (if they are Ethernet drivers) when the directory structure exists.

Signature · 2 lines
Cheers,
Jeff