From c1abc95b157fe4574919942018af143203ecca8e Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Tue, 29 Mar 2011 18:25:21 -0700 Subject: [PATCH 01/10] drivers/net/ethernet: Add ethernet dir and config option This is the initial patch to organize the drivers/net directory structure and networking device driver config options. This patch does the following: - add drivers/net/ethernet/Kconfig - integrate the new files into the existing config Signed-off-by: Jeff Kirsher --- drivers/net/Kconfig | 2 ++ drivers/net/Makefile | 2 +- drivers/net/ethernet/Kconfig | 14 ++++++++++++++ drivers/net/ethernet/Makefile | 3 +++ 4 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 drivers/net/ethernet/Kconfig create mode 100644 drivers/net/ethernet/Makefile diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 8d0314dbd946..5b95796942db 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -193,6 +193,8 @@ source "drivers/net/phy/Kconfig" # Ethernet # +source "drivers/net/ethernet/Kconfig" + menuconfig NET_ETHERNET bool "Ethernet (10 or 100Mbit)" depends on !UML diff --git a/drivers/net/Makefile b/drivers/net/Makefile index e1eca2ab505e..670b5141f0d7 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -1,5 +1,5 @@ # -# Makefile for the Linux network (ethercard) device drivers. +# Makefile for the Linux network device drivers. # obj-$(CONFIG_MII) += mii.o diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig new file mode 100644 index 000000000000..d59e4f2aa93f --- /dev/null +++ b/drivers/net/ethernet/Kconfig @@ -0,0 +1,14 @@ +# +# Ethernet LAN device configuration +# + +menuconfig ETHERNET + bool "Ethernet driver support" + depends on NET + default y + ---help--- + This section contains all the Ethernet device drivers. + +if ETHERNET + +endif # ETHERNET diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile new file mode 100644 index 000000000000..0d21dda32038 --- /dev/null +++ b/drivers/net/ethernet/Makefile @@ -0,0 +1,3 @@ +# +# Makefile for the Linux network Ethernet device drivers. +# From ca7a8e85262e93065b2a49dfb96a24d4a534a049 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Wed, 30 Mar 2011 03:47:06 -0700 Subject: [PATCH 02/10] 3c*/acenic/typhoon: Move 3Com Ethernet drivers Moves the 3Com drivers into drivers/net/ethernet/3com/ and the necessary Kconfig and Makefile changes. Did not move the following drivers becuase they use a non-3Com chipset: 3c503, 3c505, 3c507, 3c523 and 3c527 CC: Steffen Klassert CC: David Dillow CC: Jes Sorensen CC: Alan Cox CC: David Hinds Signed-off-by: Jeff Kirsher Acked-by: David Dillow --- MAINTAINERS | 6 +- drivers/net/Kconfig | 138 ++-------------- drivers/net/Makefile | 7 +- drivers/net/{ => ethernet/3com}/3c501.c | 0 drivers/net/{ => ethernet/3com}/3c501.h | 0 drivers/net/{ => ethernet/3com}/3c509.c | 0 drivers/net/{ => ethernet/3com}/3c515.c | 0 .../net/{pcmcia => ethernet/3com}/3c574_cs.c | 0 .../net/{pcmcia => ethernet/3com}/3c589_cs.c | 0 drivers/net/{ => ethernet/3com}/3c59x.c | 0 drivers/net/ethernet/3com/Kconfig | 147 ++++++++++++++++++ drivers/net/ethernet/3com/Makefile | 12 ++ drivers/net/{ => ethernet/3com}/acenic.c | 0 drivers/net/{ => ethernet/3com}/acenic.h | 0 drivers/net/{ => ethernet/3com}/typhoon.c | 0 drivers/net/{ => ethernet/3com}/typhoon.h | 0 drivers/net/ethernet/Kconfig | 2 + drivers/net/ethernet/Makefile | 2 + drivers/net/pcmcia/Kconfig | 18 --- drivers/net/pcmcia/Makefile | 2 - 20 files changed, 176 insertions(+), 158 deletions(-) rename drivers/net/{ => ethernet/3com}/3c501.c (100%) rename drivers/net/{ => ethernet/3com}/3c501.h (100%) rename drivers/net/{ => ethernet/3com}/3c509.c (100%) rename drivers/net/{ => ethernet/3com}/3c515.c (100%) rename drivers/net/{pcmcia => ethernet/3com}/3c574_cs.c (100%) rename drivers/net/{pcmcia => ethernet/3com}/3c589_cs.c (100%) rename drivers/net/{ => ethernet/3com}/3c59x.c (100%) create mode 100644 drivers/net/ethernet/3com/Kconfig create mode 100644 drivers/net/ethernet/3com/Makefile rename drivers/net/{ => ethernet/3com}/acenic.c (100%) rename drivers/net/{ => ethernet/3com}/acenic.h (100%) rename drivers/net/{ => ethernet/3com}/typhoon.c (100%) rename drivers/net/{ => ethernet/3com}/typhoon.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 51d42fbc8dc4..112e22696a77 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -124,13 +124,13 @@ M: Steffen Klassert L: netdev@vger.kernel.org S: Maintained F: Documentation/networking/vortex.txt -F: drivers/net/3c59x.c +F: drivers/net/ethernet/3com/3c59x.c 3CR990 NETWORK DRIVER M: David Dillow L: netdev@vger.kernel.org S: Maintained -F: drivers/net/typhoon* +F: drivers/net/ethernet/3com/typhoon* 3WARE SAS/SATA-RAID SCSI DRIVERS (3W-XXXX, 3W-9XXX, 3W-SAS) M: Adam Radford @@ -214,7 +214,7 @@ ACENIC DRIVER M: Jes Sorensen L: linux-acenic@sunsite.dk S: Maintained -F: drivers/net/acenic* +F: drivers/net/ethernet/3com/acenic* ACER ASPIRE ONE TEMPERATURE AND FAN DRIVER M: Peter Feuerer diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 5b95796942db..0b3ea213b610 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -616,38 +616,11 @@ 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 - . - - 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 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 - . 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 + depends on ISA select CRC32 - help + ---help--- If you have a network (Ethernet) card of this type, say Y and read the Ethernet-HOWTO, available from . @@ -657,7 +630,7 @@ config EL2 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 . If you have a card of @@ -669,8 +642,8 @@ config ELPLUS config EL16 tristate "3c507 \"EtherLink 16\" support (EXPERIMENTAL)" - depends on NET_VENDOR_3COM && ISA && EXPERIMENTAL - help + depends on ISA && EXPERIMENTAL + ---help--- If you have a network (Ethernet) card of this type, say Y and read the Ethernet-HOWTO, available from . @@ -678,36 +651,10 @@ config EL16 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) - ---help--- - If you have a network (Ethernet) card belonging to the 3Com - EtherLinkIII series, say Y and read the Ethernet-HOWTO, available - from . - - 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 - . - - 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 + depends on MCA_LEGACY + ---help--- If you have a network (Ethernet) card of this type, say Y and read the Ethernet-HOWTO, available from . @@ -717,8 +664,8 @@ config ELMC config ELMC_II tristate "3c527 \"EtherLink/MC 32\" support (EXPERIMENTAL)" - depends on NET_VENDOR_3COM && MCA && MCA_LEGACY - help + 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 . @@ -726,46 +673,6 @@ config ELMC_II 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) - select MII - ---help--- - This option enables driver support for a large number of 10Mbps and - 10/100Mbps EISA, PCI and PCMCIA 3Com network cards: - - "Vortex" (Fast EtherLink 3c590/3c592/3c595/3c597) EISA and PCI - "Boomerang" (EtherLink XL 3c900 or 3c905) PCI - "Cyclone" (3c540/3c900/3c905/3c980/3c575/3c656) PCI and Cardbus - "Tornado" (3c905) PCI - "Hurricane" (3c555/3cSOHO) PCI - - If you have such a card, say Y and read the Ethernet-HOWTO, - available from . More - specific information is in - and in the comments at - the beginning of . - - To compile this support as a module, choose M here. - -config TYPHOON - tristate "3cr990 series \"Typhoon\" support" - depends on NET_VENDOR_3COM && PCI - select CRC32 - ---help--- - This option enables driver support for the 3cr990 series of cards: - - 3C990-TX, 3CR990-TX-95, 3CR990-TX-97, 3CR990-FX-95, 3CR990-FX-97, - 3CR990SVR, 3CR990SVR95, 3CR990SVR97, 3CR990-FX-95 Server, - 3CR990-FX-97 Server, 3C990B-TX-M, 3C990BSVR - - If you have a network (Ethernet) card of this type, say Y and read - the Ethernet-HOWTO, available from - . - - 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 @@ -2046,33 +1953,6 @@ menuconfig NETDEV_1000 if NETDEV_1000 -config ACENIC - tristate "Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support" - depends on PCI - ---help--- - Say Y here if you have an Alteon AceNIC, 3Com 3C985(B), NetGear - GA620, SGI Gigabit or Farallon PN9000-SX PCI Gigabit Ethernet - adapter. The driver allows for using the Jumbo Frame option (9000 - bytes/frame) however it requires that your switches can handle this - as well. To enable Jumbo Frames, add `mtu 9000' to your ifconfig - line. - - To compile this driver as a module, choose M here: the - module will be called acenic. - -config ACENIC_OMIT_TIGON_I - bool "Omit support for old Tigon I based AceNICs" - depends on ACENIC - help - Say Y here if you only have Tigon II based AceNICs and want to leave - out support for the older Tigon I based cards which are no longer - being sold (ie. the original Alteon AceNIC and 3Com 3C985 (non B - version)). This will reduce the size of the driver object by - app. 100KB. If you are not sure whether your card is a Tigon I or a - Tigon II, say N here. - - The safe and default value for this is N. - config DL2K tristate "DL2000/TC902x-based Gigabit Ethernet support" depends on PCI diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 670b5141f0d7..d4d6744ab607 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -66,8 +66,6 @@ obj-$(CONFIG_SUNVNET) += sunvnet.o obj-$(CONFIG_MACE) += mace.o 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 @@ -78,7 +76,6 @@ obj-$(CONFIG_SIS190) += sis190.o obj-$(CONFIG_SIS900) += sis900.o obj-$(CONFIG_R6040) += r6040.o obj-$(CONFIG_YELLOWFIN) += yellowfin.o -obj-$(CONFIG_ACENIC) += acenic.o obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o obj-$(CONFIG_NATSEMI) += natsemi.o obj-$(CONFIG_NS83820) += ns83820.o @@ -187,13 +184,10 @@ 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 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 @@ -269,6 +263,7 @@ obj-$(CONFIG_S6GMAC) += s6gmac.o obj-$(CONFIG_ARM) += arm/ obj-$(CONFIG_DEV_APPLETALK) += appletalk/ +obj-$(CONFIG_ETHERNET) += ethernet/ obj-$(CONFIG_TR) += tokenring/ obj-$(CONFIG_WAN) += wan/ obj-$(CONFIG_ARCNET) += arcnet/ diff --git a/drivers/net/3c501.c b/drivers/net/ethernet/3com/3c501.c similarity index 100% rename from drivers/net/3c501.c rename to drivers/net/ethernet/3com/3c501.c diff --git a/drivers/net/3c501.h b/drivers/net/ethernet/3com/3c501.h similarity index 100% rename from drivers/net/3c501.h rename to drivers/net/ethernet/3com/3c501.h diff --git a/drivers/net/3c509.c b/drivers/net/ethernet/3com/3c509.c similarity index 100% rename from drivers/net/3c509.c rename to drivers/net/ethernet/3com/3c509.c diff --git a/drivers/net/3c515.c b/drivers/net/ethernet/3com/3c515.c similarity index 100% rename from drivers/net/3c515.c rename to drivers/net/ethernet/3com/3c515.c diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/ethernet/3com/3c574_cs.c similarity index 100% rename from drivers/net/pcmcia/3c574_cs.c rename to drivers/net/ethernet/3com/3c574_cs.c diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/ethernet/3com/3c589_cs.c similarity index 100% rename from drivers/net/pcmcia/3c589_cs.c rename to drivers/net/ethernet/3com/3c589_cs.c diff --git a/drivers/net/3c59x.c b/drivers/net/ethernet/3com/3c59x.c similarity index 100% rename from drivers/net/3c59x.c rename to drivers/net/ethernet/3com/3c59x.c diff --git a/drivers/net/ethernet/3com/Kconfig b/drivers/net/ethernet/3com/Kconfig new file mode 100644 index 000000000000..497f038dcd47 --- /dev/null +++ b/drivers/net/ethernet/3com/Kconfig @@ -0,0 +1,147 @@ +# +# 3Com Ethernet device configuration +# + +config NET_VENDOR_3COM + bool "3Com devices" + depends on ISA || EISA || MCA || PCI || PCMCIA + ---help--- + If you have a network (Ethernet) card belonging to this class, say Y + and read the Ethernet-HOWTO, available from + . + + 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. + +if NET_VENDOR_3COM + +config EL1 + tristate "3c501 \"EtherLink\" support" + depends on ISA + ---help--- + If you have a network (Ethernet) card of this type, say Y and read + the Ethernet-HOWTO, available from + . 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 EL3 + tristate "3c509/3c529 (MCA)/3c579 \"EtherLink III\" support" + 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 + from . + + 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 (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 + . + + To compile this driver as a module, choose M here. The module + will be called 3c515. + +config PCMCIA_3C574 + tristate "3Com 3c574 PCMCIA support" + depends on PCMCIA + ---help--- + Say Y here if you intend to attach a 3Com 3c574 or compatible PCMCIA + (PC-card) Fast Ethernet card to your computer. + + To compile this driver as a module, choose M here: the module will be + called 3c574_cs. If unsure, say N. + +config PCMCIA_3C589 + tristate "3Com 3c589 PCMCIA support" + depends on PCMCIA + ---help--- + Say Y here if you intend to attach a 3Com 3c589 or compatible PCMCIA + (PC-card) Ethernet card to your computer. + + To compile this driver as a module, choose M here: the module will be + called 3c589_cs. If unsure, say N. + +config VORTEX + tristate "3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" support" + depends on (PCI || EISA) + select MII + ---help--- + This option enables driver support for a large number of 10Mbps and + 10/100Mbps EISA, PCI and PCMCIA 3Com network cards: + + "Vortex" (Fast EtherLink 3c590/3c592/3c595/3c597) EISA and PCI + "Boomerang" (EtherLink XL 3c900 or 3c905) PCI + "Cyclone" (3c540/3c900/3c905/3c980/3c575/3c656) PCI and Cardbus + "Tornado" (3c905) PCI + "Hurricane" (3c555/3cSOHO) PCI + + If you have such a card, say Y and read the Ethernet-HOWTO, + available from . More + specific information is in + and in the comments at + the beginning of . + + To compile this support as a module, choose M here. + +config TYPHOON + tristate "3cr990 series \"Typhoon\" support" + depends on PCI + select CRC32 + ---help--- + This option enables driver support for the 3cr990 series of cards: + + 3C990-TX, 3CR990-TX-95, 3CR990-TX-97, 3CR990-FX-95, 3CR990-FX-97, + 3CR990SVR, 3CR990SVR95, 3CR990SVR97, 3CR990-FX-95 Server, + 3CR990-FX-97 Server, 3C990B-TX-M, 3C990BSVR + + If you have a network (Ethernet) card of this type, say Y and read + the Ethernet-HOWTO, available from + . + + To compile this driver as a module, choose M here. The module + will be called typhoon. + +config ACENIC + tristate "Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support" + depends on PCI + ---help--- + Say Y here if you have an Alteon AceNIC, 3Com 3C985(B), NetGear + GA620, SGI Gigabit or Farallon PN9000-SX PCI Gigabit Ethernet + adapter. The driver allows for using the Jumbo Frame option (9000 + bytes/frame) however it requires that your switches can handle this + as well. To enable Jumbo Frames, add `mtu 9000' to your ifconfig + line. + + To compile this driver as a module, choose M here: the + module will be called acenic. + +config ACENIC_OMIT_TIGON_I + bool "Omit support for old Tigon I based AceNICs" + depends on ACENIC + ---help--- + Say Y here if you only have Tigon II based AceNICs and want to leave + out support for the older Tigon I based cards which are no longer + being sold (ie. the original Alteon AceNIC and 3Com 3C985 (non B + version)). This will reduce the size of the driver object by + app. 100KB. If you are not sure whether your card is a Tigon I or a + Tigon II, say N here. + + The safe and default value for this is N. + +endif # NET_VENDOR_3COM diff --git a/drivers/net/ethernet/3com/Makefile b/drivers/net/ethernet/3com/Makefile new file mode 100644 index 000000000000..96d1d60d67b6 --- /dev/null +++ b/drivers/net/ethernet/3com/Makefile @@ -0,0 +1,12 @@ +# +# Makefile for the 3Com Ethernet device drivers +# + +obj-$(CONFIG_EL1) += 3c501.o +obj-$(CONFIG_EL3) += 3c509.o +obj-$(CONFIG_3C515) += 3c515.o +obj-$(CONFIG_PCMCIA_3C589) += 3c589_cs.o +obj-$(CONFIG_PCMCIA_3C574) += 3c574_cs.o +obj-$(CONFIG_VORTEX) += 3c59x.o +obj-$(CONFIG_ACENIC) += acenic.o +obj-$(CONFIG_TYPHOON) += typhoon.o diff --git a/drivers/net/acenic.c b/drivers/net/ethernet/3com/acenic.c similarity index 100% rename from drivers/net/acenic.c rename to drivers/net/ethernet/3com/acenic.c diff --git a/drivers/net/acenic.h b/drivers/net/ethernet/3com/acenic.h similarity index 100% rename from drivers/net/acenic.h rename to drivers/net/ethernet/3com/acenic.h diff --git a/drivers/net/typhoon.c b/drivers/net/ethernet/3com/typhoon.c similarity index 100% rename from drivers/net/typhoon.c rename to drivers/net/ethernet/3com/typhoon.c diff --git a/drivers/net/typhoon.h b/drivers/net/ethernet/3com/typhoon.h similarity index 100% rename from drivers/net/typhoon.h rename to drivers/net/ethernet/3com/typhoon.h diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index d59e4f2aa93f..18193ecd8cb6 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -11,4 +11,6 @@ menuconfig ETHERNET if ETHERNET +source "drivers/net/ethernet/3com/Kconfig" + endif # ETHERNET diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 0d21dda32038..07766baf7920 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -1,3 +1,5 @@ # # Makefile for the Linux network Ethernet device drivers. # + +obj-$(CONFIG_NET_VENDOR_3COM) += 3com/ diff --git a/drivers/net/pcmcia/Kconfig b/drivers/net/pcmcia/Kconfig index 9b8f793b1cc8..b67c5ed00f1b 100644 --- a/drivers/net/pcmcia/Kconfig +++ b/drivers/net/pcmcia/Kconfig @@ -21,24 +21,6 @@ menuconfig NET_PCMCIA if NET_PCMCIA && PCMCIA -config PCMCIA_3C589 - tristate "3Com 3c589 PCMCIA support" - help - Say Y here if you intend to attach a 3Com 3c589 or compatible PCMCIA - (PC-card) Ethernet card to your computer. - - To compile this driver as a module, choose M here: the module will be - called 3c589_cs. If unsure, say N. - -config PCMCIA_3C574 - tristate "3Com 3c574 PCMCIA support" - help - Say Y here if you intend to attach a 3Com 3c574 or compatible PCMCIA - (PC-card) Fast Ethernet card to your computer. - - To compile this driver as a module, choose M here: the module will be - called 3c574_cs. If unsure, say N. - config PCMCIA_FMVJ18X tristate "Fujitsu FMV-J18x PCMCIA support" select CRC32 diff --git a/drivers/net/pcmcia/Makefile b/drivers/net/pcmcia/Makefile index 87d2d99f4c14..2f2ab3bc028a 100644 --- a/drivers/net/pcmcia/Makefile +++ b/drivers/net/pcmcia/Makefile @@ -3,8 +3,6 @@ # # 16-bit client drivers -obj-$(CONFIG_PCMCIA_3C589) += 3c589_cs.o -obj-$(CONFIG_PCMCIA_3C574) += 3c574_cs.o obj-$(CONFIG_PCMCIA_FMVJ18X) += fmvj18x_cs.o obj-$(CONFIG_PCMCIA_NMCLAN) += nmclan_cs.o obj-$(CONFIG_PCMCIA_PCNET) += pcnet_cs.o From b955f6ca776f3bab3d1e2c5fb1d247b203cbda14 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Wed, 30 Mar 2011 07:46:36 -0700 Subject: [PATCH 03/10] amd: Move AMD (Lance) chipset drivers Moves the drivers for the AMD chipsets into drivers/net/ethernet/amd/ and the necessary Kconfig and Makfile changes. The au1000 (Alchemy) driver was also moved into the same directory even though it is not a "Lance" driver. CC: Peter Maydell CC: Roman Hodek CC: "Maciej W. Rozycki" CC: Donald Becker CC: Sam Creasey CC: Miguel de Icaza CC: Thomas Bogendoerfer CC: Don Fry CC: Geert Uytterhoeven CC: Russell King CC: David Davies CC: "M.Hipp" CC: Pete Popov CC: David Hinds CC: "Roger C. Pao" Signed-off-by: Jeff Kirsher --- MAINTAINERS | 4 +- drivers/net/Kconfig | 153 -------------- drivers/net/Makefile | 14 -- drivers/net/arm/Kconfig | 7 - drivers/net/arm/Makefile | 1 - drivers/net/ethernet/Kconfig | 1 + drivers/net/ethernet/Makefile | 1 + drivers/net/{ => ethernet/amd}/7990.c | 0 drivers/net/{ => ethernet/amd}/7990.h | 0 drivers/net/ethernet/amd/Kconfig | 192 ++++++++++++++++++ drivers/net/ethernet/amd/Makefile | 20 ++ drivers/net/{ => ethernet/amd}/a2065.c | 0 drivers/net/{ => ethernet/amd}/a2065.h | 0 drivers/net/{arm => ethernet/amd}/am79c961a.c | 0 drivers/net/{arm => ethernet/amd}/am79c961a.h | 0 drivers/net/{ => ethernet/amd}/amd8111e.c | 0 drivers/net/{ => ethernet/amd}/amd8111e.h | 0 drivers/net/{ => ethernet/amd}/ariadne.c | 0 drivers/net/{ => ethernet/amd}/ariadne.h | 0 drivers/net/{ => ethernet/amd}/atarilance.c | 0 drivers/net/{ => ethernet/amd}/au1000_eth.c | 0 drivers/net/{ => ethernet/amd}/au1000_eth.h | 0 drivers/net/{ => ethernet/amd}/declance.c | 0 drivers/net/{ => ethernet/amd}/depca.c | 0 drivers/net/{ => ethernet/amd}/depca.h | 0 drivers/net/{ => ethernet/amd}/hplance.c | 0 drivers/net/{ => ethernet/amd}/hplance.h | 0 drivers/net/{ => ethernet/amd}/lance.c | 0 drivers/net/{ => ethernet/amd}/mvme147.c | 0 drivers/net/{ => ethernet/amd}/ni65.c | 0 drivers/net/{ => ethernet/amd}/ni65.h | 0 .../net/{pcmcia => ethernet/amd}/nmclan_cs.c | 0 drivers/net/{ => ethernet/amd}/pcnet32.c | 0 drivers/net/{ => ethernet/amd}/sun3lance.c | 0 drivers/net/{ => ethernet/amd}/sunlance.c | 0 drivers/net/pcmcia/Kconfig | 9 - drivers/net/pcmcia/Makefile | 1 - 37 files changed, 216 insertions(+), 187 deletions(-) rename drivers/net/{ => ethernet/amd}/7990.c (100%) rename drivers/net/{ => ethernet/amd}/7990.h (100%) create mode 100644 drivers/net/ethernet/amd/Kconfig create mode 100644 drivers/net/ethernet/amd/Makefile rename drivers/net/{ => ethernet/amd}/a2065.c (100%) rename drivers/net/{ => ethernet/amd}/a2065.h (100%) rename drivers/net/{arm => ethernet/amd}/am79c961a.c (100%) rename drivers/net/{arm => ethernet/amd}/am79c961a.h (100%) rename drivers/net/{ => ethernet/amd}/amd8111e.c (100%) rename drivers/net/{ => ethernet/amd}/amd8111e.h (100%) rename drivers/net/{ => ethernet/amd}/ariadne.c (100%) rename drivers/net/{ => ethernet/amd}/ariadne.h (100%) rename drivers/net/{ => ethernet/amd}/atarilance.c (100%) rename drivers/net/{ => ethernet/amd}/au1000_eth.c (100%) rename drivers/net/{ => ethernet/amd}/au1000_eth.h (100%) rename drivers/net/{ => ethernet/amd}/declance.c (100%) rename drivers/net/{ => ethernet/amd}/depca.c (100%) rename drivers/net/{ => ethernet/amd}/depca.h (100%) rename drivers/net/{ => ethernet/amd}/hplance.c (100%) rename drivers/net/{ => ethernet/amd}/hplance.h (100%) rename drivers/net/{ => ethernet/amd}/lance.c (100%) rename drivers/net/{ => ethernet/amd}/mvme147.c (100%) rename drivers/net/{ => ethernet/amd}/ni65.c (100%) rename drivers/net/{ => ethernet/amd}/ni65.h (100%) rename drivers/net/{pcmcia => ethernet/amd}/nmclan_cs.c (100%) rename drivers/net/{ => ethernet/amd}/pcnet32.c (100%) rename drivers/net/{ => ethernet/amd}/sun3lance.c (100%) rename drivers/net/{ => ethernet/amd}/sunlance.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 112e22696a77..6f9dc946fc9b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -746,7 +746,7 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) W: http://www.arm.linux.org.uk/ S: Maintained F: arch/arm/mach-ebsa110/ -F: drivers/net/arm/am79c961a.* +F: drivers/net/ethernet/amd/am79c961a.* ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6) M: Daniel Ribeiro @@ -4941,7 +4941,7 @@ PCNET32 NETWORK DRIVER M: Don Fry L: netdev@vger.kernel.org S: Maintained -F: drivers/net/pcnet32.c +F: drivers/net/ethernet/amd/pcnet32.c PCRYPT PARALLEL CRYPTO ENGINE M: Steffen Klassert diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 0b3ea213b610..b686dab54ec6 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -287,27 +287,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 - select CRC32 - help - If you have a Commodore A2065 Ethernet adapter, say Y. Otherwise, - say N. - - To compile this driver as a module, choose M here: the module - will be called a2065. - config HYDRA tristate "Hydra support" depends on ZORRO @@ -387,16 +366,6 @@ config MACMACE say Y and read the Ethernet-HOWTO, available from . -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 MVME16x_NET tristate "MVME16x Ethernet support" depends on MVME16x @@ -415,27 +384,6 @@ config BVME6000_NET 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 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 - . - - 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 @@ -445,14 +393,6 @@ config SUN3_82586 that this driver does not support 82586-based adapters on additional VME boards. -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 LASI_82596 tristate "Lasi ethernet" depends on GSC @@ -487,15 +427,6 @@ config XTENSA_XT2000_SONIC help This is the driver for the onboard card of the Xtensa XT2000 board. -config MIPS_AU1X00_ENET - tristate "MIPS AU1000 Ethernet support" - depends on MIPS_ALCHEMY - select PHYLIB - select CRC32 - help - If you have an Alchemy Semi AU1X00 based system - say Y. Otherwise, say N. - config SGI_IOC3_ETH bool "SGI IOC3 Ethernet" depends on PCI && SGI_IP27 @@ -545,19 +476,6 @@ config SH_ETH This driver supporting CPUs are: - SH7710, SH7712, SH7763, SH7619, SH7724, and SH7757. -config SUNLANCE - tristate "Sun LANCE support" - depends on SBUS - select CRC32 - help - This driver supports the "le" interface present on all 32-bit Sparc - systems, on some older Ultra systems and as an Sbus option. These - cards are based on the AMD Lance chipset, which is better known - via the NE2100 cards. - - To compile this driver as a module, choose M here: the module - will be called sunlance. - config HAPPYMEAL tristate "Sun Happy Meal 10/100baseT support" depends on SBUS || PCI @@ -673,18 +591,6 @@ config ELMC_II To compile this driver as a module, choose M here. The module will be called 3c527. -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 - . 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 @@ -1020,17 +926,6 @@ config NI52 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 - help - If you have a network (Ethernet) card of this type, say Y and read - the Ethernet-HOWTO, available from - . - - 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 @@ -1056,19 +951,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 - as well as - . - - 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 @@ -1287,32 +1169,6 @@ config NET_PCI will be asked for your specific card in the following questions. If you are unsure, say Y. -config PCNET32 - tristate "AMD PCnet32 PCI support" - depends on NET_PCI && PCI - select CRC32 - select MII - help - If you have a PCnet32 or PCnetPCI based network (Ethernet) card, - answer Y here and read the Ethernet-HOWTO, available from - . - - To compile this driver as a module, choose M here. The module - will be called pcnet32. - -config AMD8111_ETH - tristate "AMD 8111 (new PCI lance) support" - depends on NET_PCI && PCI - select CRC32 - select MII - help - If you have an AMD 8111-based PCI lance ethernet card, - answer Y here and read the Ethernet-HOWTO, available from - . - - To compile this driver as a module, choose M here. The module - will be called amd8111e. - config ADAPTEC_STARFIRE tristate "Adaptec Starfire/DuraLAN support" depends on NET_PCI && PCI @@ -1834,15 +1690,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 FEC bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)" depends on M523x || M527x || M5272 || M528x || M520x || M532x || \ diff --git a/drivers/net/Makefile b/drivers/net/Makefile index d4d6744ab607..59b6cc932037 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -56,7 +56,6 @@ obj-$(CONFIG_PLIP) += plip.o obj-$(CONFIG_ROADRUNNER) += rrunner.o obj-$(CONFIG_HAPPYMEAL) += sunhme.o -obj-$(CONFIG_SUNLANCE) += sunlance.o obj-$(CONFIG_SUNQE) += sunqe.o obj-$(CONFIG_SUNBMAC) += sunbmac.o obj-$(CONFIG_SUNGEM) += sungem.o sungem_phy.o @@ -67,7 +66,6 @@ obj-$(CONFIG_MACE) += mace.o obj-$(CONFIG_BMAC) += bmac.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 obj-$(CONFIG_EPIC100) += epic100.o @@ -177,9 +175,7 @@ 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 obj-$(CONFIG_DEFXX) += defxx.o obj-$(CONFIG_SGISEEQ) += sgiseeq.o obj-$(CONFIG_SGI_O2MACE_ETH) += meth.o @@ -194,12 +190,10 @@ 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 -obj-$(CONFIG_NI65) += ni65.o obj-$(CONFIG_ELPLUS) += 3c505.o obj-$(CONFIG_AC3200) += ac3200.o 8390.o obj-$(CONFIG_APRICOT) += 82596.o @@ -214,19 +208,12 @@ obj-$(CONFIG_LP486E) += lp486e.o obj-$(CONFIG_ETH16I) += eth16i.o obj-$(CONFIG_ZORRO8390) += zorro8390.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_DECLANCE) += declance.o -obj-$(CONFIG_ATARILANCE) += atarilance.o -obj-$(CONFIG_A2065) += a2065.o obj-$(CONFIG_HYDRA) += hydra.o -obj-$(CONFIG_ARIADNE) += ariadne.o obj-$(CONFIG_CS89x0) += cs89x0.o obj-$(CONFIG_MACSONIC) += macsonic.o obj-$(CONFIG_MACMACE) += macmace.o @@ -236,7 +223,6 @@ obj-$(CONFIG_VETH) += veth.o obj-$(CONFIG_NET_NETX) += netx-eth.o obj-$(CONFIG_DL2K) += dl2k.o obj-$(CONFIG_R8169) += r8169.o -obj-$(CONFIG_AMD8111_ETH) += amd8111e.o obj-$(CONFIG_IBMVETH) += ibmveth.o obj-$(CONFIG_S2IO) += s2io.o obj-$(CONFIG_VXGE) += vxge/ diff --git a/drivers/net/arm/Kconfig b/drivers/net/arm/Kconfig index 39e1c0d39476..d0c8cf254cb0 100644 --- a/drivers/net/arm/Kconfig +++ b/drivers/net/arm/Kconfig @@ -2,13 +2,6 @@ # Acorn Network device configuration # These are for Acorn's Expansion card network interfaces # -config ARM_AM79C961A - bool "ARM EBSA110 AM79C961A support" - depends on ARM && ARCH_EBSA110 - select CRC32 - help - If you wish to compile a kernel for the EBSA-110, then you should - always answer Y to this. config ARM_ETHER1 tristate "Acorn Ether1 support" diff --git a/drivers/net/arm/Makefile b/drivers/net/arm/Makefile index 303171f589e6..63c57be34abf 100644 --- a/drivers/net/arm/Makefile +++ b/drivers/net/arm/Makefile @@ -3,7 +3,6 @@ # Makefile for the ARM network device drivers # -obj-$(CONFIG_ARM_AM79C961A) += am79c961a.o obj-$(CONFIG_ARM_ETHERH) += etherh.o obj-$(CONFIG_ARM_ETHER3) += ether3.o obj-$(CONFIG_ARM_ETHER1) += ether1.o diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index 18193ecd8cb6..5e62efd58172 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -12,5 +12,6 @@ menuconfig ETHERNET if ETHERNET source "drivers/net/ethernet/3com/Kconfig" +source "drivers/net/ethernet/amd/Kconfig" endif # ETHERNET diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 07766baf7920..1bc2ac25bab0 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -3,3 +3,4 @@ # obj-$(CONFIG_NET_VENDOR_3COM) += 3com/ +obj-$(CONFIG_NET_VENDOR_AMD) += amd/ diff --git a/drivers/net/7990.c b/drivers/net/ethernet/amd/7990.c similarity index 100% rename from drivers/net/7990.c rename to drivers/net/ethernet/amd/7990.c diff --git a/drivers/net/7990.h b/drivers/net/ethernet/amd/7990.h similarity index 100% rename from drivers/net/7990.h rename to drivers/net/ethernet/amd/7990.h diff --git a/drivers/net/ethernet/amd/Kconfig b/drivers/net/ethernet/amd/Kconfig new file mode 100644 index 000000000000..05139403ea8d --- /dev/null +++ b/drivers/net/ethernet/amd/Kconfig @@ -0,0 +1,192 @@ +# +# AMD network device configuration +# + +config NET_VENDOR_AMD + bool "AMD devices" + depends on DIO || MACH_DECSTATION || MVME147 || ATARI || SUN3 || \ + SUN3X || SBUS || PCI || ZORRO || (ISA && ISA_DMA_API) || \ + (ARM && ARCH_EBSA110) || ISA || EISA || MCA || PCMCIA + ---help--- + If you have a network (Ethernet) chipset belonging to this class, + say Y. + + Note that the answer to this question does not directly affect + the kernel: saying N will just case the configurator to skip all + the questions regarding AMD chipsets. If you say Y, you will be asked + for your specific chipset/driver in the following questions. + +if NET_VENDOR_AMD + +config A2065 + tristate "A2065 support" + depends on ZORRO + select CRC32 + ---help--- + If you have a Commodore A2065 Ethernet adapter, say Y. Otherwise, + say N. + + To compile this driver as a module, choose M here: the module + will be called a2065. + +config AMD8111_ETH + tristate "AMD 8111 (new PCI LANCE) support" + depends on PCI + select CRC32 + select MII + ---help--- + If you have an AMD 8111-based PCI LANCE ethernet card, + answer Y here and read the Ethernet-HOWTO, available from + . + + To compile this driver as a module, choose M here. The module + will be called amd8111e. + +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 + . 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 PCNET32 + tristate "AMD PCnet32 PCI support" + depends on PCI + select CRC32 + select MII + ---help--- + If you have a PCnet32 or PCnetPCI based network (Ethernet) card, + answer Y here and read the Ethernet-HOWTO, available from + . + + To compile this driver as a module, choose M here. The module + will be called pcnet32. + +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 ARM_AM79C961A + bool "ARM EBSA110 AM79C961A support" + depends on ARM && ARCH_EBSA110 + select CRC32 + ---help--- + If you wish to compile a kernel for the EBSA-110, then you should + always answer Y to this. + +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 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 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 + as well as + . + + To compile this driver as a module, choose M here. The module + will be called depca. + +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 MIPS_AU1X00_ENET + tristate "MIPS AU1000 Ethernet support" + depends on MIPS_ALCHEMY + select PHYLIB + select CRC32 + ---help--- + If you have an Alchemy Semi AU1X00 based system + say Y. Otherwise, say N. + +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 PCMCIA_NMCLAN + tristate "New Media PCMCIA support" + depends on PCMCIA + help + Say Y here if you intend to attach a New Media Ethernet or LiveWire + PCMCIA (PC-card) Ethernet card to your computer. + + To compile this driver as a module, choose M here: the module will be + called nmclan_cs. If unsure, say N. + +config NI65 + tristate "NI6510 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 + . + + To compile this driver as a module, choose M here. The module + will be called ni65. + +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 + . + + If you're not building a kernel for a Sun 3, say N. + +config SUNLANCE + tristate "Sun LANCE support" + depends on SBUS + select CRC32 + ---help--- + This driver supports the "le" interface present on all 32-bit Sparc + systems, on some older Ultra systems and as an Sbus option. These + cards are based on the AMD LANCE chipset, which is better known + via the NE2100 cards. + + To compile this driver as a module, choose M here: the module + will be called sunlance. + +endif # NET_VENDOR_AMD diff --git a/drivers/net/ethernet/amd/Makefile b/drivers/net/ethernet/amd/Makefile new file mode 100644 index 000000000000..175caa5328c9 --- /dev/null +++ b/drivers/net/ethernet/amd/Makefile @@ -0,0 +1,20 @@ +# +# Makefile for the AMD network device drivers. +# + +obj-$(CONFIG_A2065) += a2065.o +obj-$(CONFIG_AMD8111_ETH) += amd8111e.o +obj-$(CONFIG_ARM_AM79C961A) += am79c961a.o +obj-$(CONFIG_ARIADNE) += ariadne.o +obj-$(CONFIG_ATARILANCE) += atarilance.o +obj-$(CONFIG_DECLANCE) += declance.o +obj-$(CONFIG_DEPCA) += depca.o +obj-$(CONFIG_HPLANCE) += hplance.o 7990.o +obj-$(CONFIG_LANCE) += lance.o +obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o +obj-$(CONFIG_MVME147_NET) += mvme147.o 7990.o +obj-$(CONFIG_PCMCIA_NMCLAN) += nmclan_cs.o +obj-$(CONFIG_NI65) += ni65.o +obj-$(CONFIG_PCNET32) += pcnet32.o +obj-$(CONFIG_SUN3LANCE) += sun3lance.o +obj-$(CONFIG_SUNLANCE) += sunlance.o diff --git a/drivers/net/a2065.c b/drivers/net/ethernet/amd/a2065.c similarity index 100% rename from drivers/net/a2065.c rename to drivers/net/ethernet/amd/a2065.c diff --git a/drivers/net/a2065.h b/drivers/net/ethernet/amd/a2065.h similarity index 100% rename from drivers/net/a2065.h rename to drivers/net/ethernet/amd/a2065.h diff --git a/drivers/net/arm/am79c961a.c b/drivers/net/ethernet/amd/am79c961a.c similarity index 100% rename from drivers/net/arm/am79c961a.c rename to drivers/net/ethernet/amd/am79c961a.c diff --git a/drivers/net/arm/am79c961a.h b/drivers/net/ethernet/amd/am79c961a.h similarity index 100% rename from drivers/net/arm/am79c961a.h rename to drivers/net/ethernet/amd/am79c961a.h diff --git a/drivers/net/amd8111e.c b/drivers/net/ethernet/amd/amd8111e.c similarity index 100% rename from drivers/net/amd8111e.c rename to drivers/net/ethernet/amd/amd8111e.c diff --git a/drivers/net/amd8111e.h b/drivers/net/ethernet/amd/amd8111e.h similarity index 100% rename from drivers/net/amd8111e.h rename to drivers/net/ethernet/amd/amd8111e.h diff --git a/drivers/net/ariadne.c b/drivers/net/ethernet/amd/ariadne.c similarity index 100% rename from drivers/net/ariadne.c rename to drivers/net/ethernet/amd/ariadne.c diff --git a/drivers/net/ariadne.h b/drivers/net/ethernet/amd/ariadne.h similarity index 100% rename from drivers/net/ariadne.h rename to drivers/net/ethernet/amd/ariadne.h diff --git a/drivers/net/atarilance.c b/drivers/net/ethernet/amd/atarilance.c similarity index 100% rename from drivers/net/atarilance.c rename to drivers/net/ethernet/amd/atarilance.c diff --git a/drivers/net/au1000_eth.c b/drivers/net/ethernet/amd/au1000_eth.c similarity index 100% rename from drivers/net/au1000_eth.c rename to drivers/net/ethernet/amd/au1000_eth.c diff --git a/drivers/net/au1000_eth.h b/drivers/net/ethernet/amd/au1000_eth.h similarity index 100% rename from drivers/net/au1000_eth.h rename to drivers/net/ethernet/amd/au1000_eth.h diff --git a/drivers/net/declance.c b/drivers/net/ethernet/amd/declance.c similarity index 100% rename from drivers/net/declance.c rename to drivers/net/ethernet/amd/declance.c diff --git a/drivers/net/depca.c b/drivers/net/ethernet/amd/depca.c similarity index 100% rename from drivers/net/depca.c rename to drivers/net/ethernet/amd/depca.c diff --git a/drivers/net/depca.h b/drivers/net/ethernet/amd/depca.h similarity index 100% rename from drivers/net/depca.h rename to drivers/net/ethernet/amd/depca.h diff --git a/drivers/net/hplance.c b/drivers/net/ethernet/amd/hplance.c similarity index 100% rename from drivers/net/hplance.c rename to drivers/net/ethernet/amd/hplance.c diff --git a/drivers/net/hplance.h b/drivers/net/ethernet/amd/hplance.h similarity index 100% rename from drivers/net/hplance.h rename to drivers/net/ethernet/amd/hplance.h diff --git a/drivers/net/lance.c b/drivers/net/ethernet/amd/lance.c similarity index 100% rename from drivers/net/lance.c rename to drivers/net/ethernet/amd/lance.c diff --git a/drivers/net/mvme147.c b/drivers/net/ethernet/amd/mvme147.c similarity index 100% rename from drivers/net/mvme147.c rename to drivers/net/ethernet/amd/mvme147.c diff --git a/drivers/net/ni65.c b/drivers/net/ethernet/amd/ni65.c similarity index 100% rename from drivers/net/ni65.c rename to drivers/net/ethernet/amd/ni65.c diff --git a/drivers/net/ni65.h b/drivers/net/ethernet/amd/ni65.h similarity index 100% rename from drivers/net/ni65.h rename to drivers/net/ethernet/amd/ni65.h diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/ethernet/amd/nmclan_cs.c similarity index 100% rename from drivers/net/pcmcia/nmclan_cs.c rename to drivers/net/ethernet/amd/nmclan_cs.c diff --git a/drivers/net/pcnet32.c b/drivers/net/ethernet/amd/pcnet32.c similarity index 100% rename from drivers/net/pcnet32.c rename to drivers/net/ethernet/amd/pcnet32.c diff --git a/drivers/net/sun3lance.c b/drivers/net/ethernet/amd/sun3lance.c similarity index 100% rename from drivers/net/sun3lance.c rename to drivers/net/ethernet/amd/sun3lance.c diff --git a/drivers/net/sunlance.c b/drivers/net/ethernet/amd/sunlance.c similarity index 100% rename from drivers/net/sunlance.c rename to drivers/net/ethernet/amd/sunlance.c diff --git a/drivers/net/pcmcia/Kconfig b/drivers/net/pcmcia/Kconfig index b67c5ed00f1b..e17ad95f6668 100644 --- a/drivers/net/pcmcia/Kconfig +++ b/drivers/net/pcmcia/Kconfig @@ -41,15 +41,6 @@ config PCMCIA_PCNET To compile this driver as a module, choose M here: the module will be called pcnet_cs. If unsure, say N. -config PCMCIA_NMCLAN - tristate "New Media PCMCIA support" - help - Say Y here if you intend to attach a New Media Ethernet or LiveWire - PCMCIA (PC-card) Ethernet card to your computer. - - To compile this driver as a module, choose M here: the module will be - called nmclan_cs. If unsure, say N. - config PCMCIA_SMC91C92 tristate "SMC 91Cxx PCMCIA support" select CRC32 diff --git a/drivers/net/pcmcia/Makefile b/drivers/net/pcmcia/Makefile index 2f2ab3bc028a..985f0ae37f8f 100644 --- a/drivers/net/pcmcia/Makefile +++ b/drivers/net/pcmcia/Makefile @@ -4,7 +4,6 @@ # 16-bit client drivers obj-$(CONFIG_PCMCIA_FMVJ18X) += fmvj18x_cs.o -obj-$(CONFIG_PCMCIA_NMCLAN) += nmclan_cs.o obj-$(CONFIG_PCMCIA_PCNET) += pcnet_cs.o obj-$(CONFIG_PCMCIA_SMC91C92) += smc91c92_cs.o obj-$(CONFIG_PCMCIA_XIRC2PS) += xirc2ps_cs.o From 644570b830266ff33ff5f3542b9c838f93a55ea6 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Sat, 2 Apr 2011 06:20:12 -0700 Subject: [PATCH 04/10] 8390: Move the 8390 related drivers Moves the drivers for the National Semi-conductor 8390 chipset into drivers/net/ethernet/8390/ and the necessary Kconfig and Makefile changes. CC: Donald Becker CC: Paul Gortmaker CC: Alain Malek CC: Peter De Schrijver CC: "David Huggins-Daines" CC: Wim Dumon CC: Yoshinori Sato CC: David Hinds CC: Russell King Signed-off-by: Jeff Kirsher --- MAINTAINERS | 5 +- drivers/net/Kconfig | 283 -------------- drivers/net/Makefile | 23 -- drivers/net/arm/Kconfig | 8 - drivers/net/arm/Makefile | 1 - drivers/net/{ => ethernet/8390}/3c503.c | 0 drivers/net/{ => ethernet/8390}/3c503.h | 0 drivers/net/{ => ethernet/8390}/8390.c | 0 drivers/net/{ => ethernet/8390}/8390.h | 0 drivers/net/{ => ethernet/8390}/8390p.c | 0 drivers/net/ethernet/8390/Kconfig | 348 ++++++++++++++++++ drivers/net/ethernet/8390/Makefile | 29 ++ drivers/net/{ => ethernet/8390}/ac3200.c | 0 drivers/net/{ => ethernet/8390}/apne.c | 0 drivers/net/{ => ethernet/8390}/ax88796.c | 0 .../net/{pcmcia => ethernet/8390}/axnet_cs.c | 2 +- drivers/net/{ => ethernet/8390}/e2100.c | 0 drivers/net/{ => ethernet/8390}/es3210.c | 0 drivers/net/{arm => ethernet/8390}/etherh.c | 2 +- drivers/net/{ => ethernet/8390}/hp-plus.c | 0 drivers/net/{ => ethernet/8390}/hp.c | 0 drivers/net/{ => ethernet/8390}/hydra.c | 0 drivers/net/{ => ethernet/8390}/lib8390.c | 0 drivers/net/{ => ethernet/8390}/lne390.c | 0 drivers/net/{ => ethernet/8390}/mac8390.c | 0 drivers/net/{ => ethernet/8390}/ne-h8300.c | 0 drivers/net/{ => ethernet/8390}/ne.c | 0 drivers/net/{ => ethernet/8390}/ne2.c | 0 drivers/net/{ => ethernet/8390}/ne2k-pci.c | 0 drivers/net/{ => ethernet/8390}/ne3210.c | 0 .../net/{pcmcia => ethernet/8390}/pcnet_cs.c | 2 +- drivers/net/{ => ethernet/8390}/smc-mca.c | 0 drivers/net/{ => ethernet/8390}/smc-ultra.c | 0 drivers/net/{ => ethernet/8390}/smc-ultra32.c | 0 drivers/net/{ => ethernet/8390}/stnic.c | 0 drivers/net/{ => ethernet/8390}/wd.c | 0 drivers/net/{ => ethernet/8390}/zorro8390.c | 0 drivers/net/ethernet/Kconfig | 1 + drivers/net/ethernet/Makefile | 1 + drivers/net/pcmcia/Kconfig | 21 -- drivers/net/pcmcia/Makefile | 2 - 41 files changed, 384 insertions(+), 344 deletions(-) rename drivers/net/{ => ethernet/8390}/3c503.c (100%) rename drivers/net/{ => ethernet/8390}/3c503.h (100%) rename drivers/net/{ => ethernet/8390}/8390.c (100%) rename drivers/net/{ => ethernet/8390}/8390.h (100%) rename drivers/net/{ => ethernet/8390}/8390p.c (100%) create mode 100644 drivers/net/ethernet/8390/Kconfig create mode 100644 drivers/net/ethernet/8390/Makefile rename drivers/net/{ => ethernet/8390}/ac3200.c (100%) rename drivers/net/{ => ethernet/8390}/apne.c (100%) rename drivers/net/{ => ethernet/8390}/ax88796.c (100%) rename drivers/net/{pcmcia => ethernet/8390}/axnet_cs.c (99%) rename drivers/net/{ => ethernet/8390}/e2100.c (100%) rename drivers/net/{ => ethernet/8390}/es3210.c (100%) rename drivers/net/{arm => ethernet/8390}/etherh.c (99%) rename drivers/net/{ => ethernet/8390}/hp-plus.c (100%) rename drivers/net/{ => ethernet/8390}/hp.c (100%) rename drivers/net/{ => ethernet/8390}/hydra.c (100%) rename drivers/net/{ => ethernet/8390}/lib8390.c (100%) rename drivers/net/{ => ethernet/8390}/lne390.c (100%) rename drivers/net/{ => ethernet/8390}/mac8390.c (100%) rename drivers/net/{ => ethernet/8390}/ne-h8300.c (100%) rename drivers/net/{ => ethernet/8390}/ne.c (100%) rename drivers/net/{ => ethernet/8390}/ne2.c (100%) rename drivers/net/{ => ethernet/8390}/ne2k-pci.c (100%) rename drivers/net/{ => ethernet/8390}/ne3210.c (100%) rename drivers/net/{pcmcia => ethernet/8390}/pcnet_cs.c (99%) rename drivers/net/{ => ethernet/8390}/smc-mca.c (100%) rename drivers/net/{ => ethernet/8390}/smc-ultra.c (100%) rename drivers/net/{ => ethernet/8390}/smc-ultra32.c (100%) rename drivers/net/{ => ethernet/8390}/stnic.c (100%) rename drivers/net/{ => ethernet/8390}/wd.c (100%) rename drivers/net/{ => ethernet/8390}/zorro8390.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 6f9dc946fc9b..c6945830ea46 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -170,8 +170,7 @@ F: include/linux/serial_8250.h 8390 NETWORK DRIVERS [WD80x3/SMC-ELITE, SMC-ULTRA, NE2000, 3C503, etc.] L: netdev@vger.kernel.org S: Orphan / Obsolete -F: drivers/net/*8390* -F: drivers/net/ax88796.c +F: drivers/net/ethernet/8390/ 9P FILE SYSTEM M: Eric Van Hensbergen @@ -6568,7 +6567,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/ethernet/8390/ne-h8300.c UDF FILESYSTEM M: Jan Kara diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index b686dab54ec6..c877f4114e04 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -237,22 +237,6 @@ config MACB source "drivers/net/arm/Kconfig" -config AX88796 - tristate "ASIX AX88796 NE2000 clone support" - depends on ARM || MIPS || SUPERH - select PHYLIB - select MDIO_BITBANG - 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 @@ -287,50 +271,6 @@ config BMAC To compile this driver as a module, choose M here: the module will be called bmac. -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 - . - config MAC89x0 tristate "Macintosh CS89x0 based ethernet cards" depends on MAC @@ -449,18 +389,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 - . - - If unsure, say N. - config SH_ETH tristate "Renesas SuperH Ethernet support" depends on SUPERH && \ @@ -591,74 +519,6 @@ config ELMC_II To compile this driver as a module, choose M here. The module will be called 3c527. -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 - . - - 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 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 - . - - 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 . - - 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 - . - - 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 - . - - 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) @@ -979,18 +839,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 - . - - 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 @@ -1032,30 +880,6 @@ config EEXPRESS_PRO 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 - select CRC32 - help - If you have a network (Ethernet) card of this type, say Y and read - the Ethernet-HOWTO, available from - . - - 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 - . - - 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 @@ -1075,26 +899,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 - . 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 ZNET tristate "Zenith Z-Note support (EXPERIMENTAL)" depends on NET_ISA && EXPERIMENTAL && ISA_DMA_API @@ -1116,18 +920,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 - . - - 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 @@ -1183,18 +975,6 @@ config ADAPTEC_STARFIRE To compile this driver as a module, choose M here: the module will be called starfire. This is recommended. -config AC3200 - tristate "Ansel Communications EISA 3200 support (EXPERIMENTAL)" - depends on NET_PCI && (ISA || EISA) && EXPERIMENTAL - select CRC32 - help - If you have a network (Ethernet) card of this type, say Y and read - the Ethernet-HOWTO, available from - . - - To compile this driver as a module, choose M here. The module - will be called ac3200. - config KSZ884X_PCI tristate "Micrel KSZ8841/2 PCI" depends on NET_PCI && PCI @@ -1310,18 +1090,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 - . - - 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 @@ -1342,50 +1110,6 @@ config NATSEMI More specific information and updates are available from . -config NE2K_PCI - tristate "PCI NE2000 and clones support (see help)" - depends on NET_PCI && PCI - select CRC32 - ---help--- - This driver is for NE2000 compatible PCI cards. It will not work - with ISA NE2000 cards (they have their own driver, "NE2000/NE1000 - support" below). If you have a PCI NE2000 network (Ethernet) card, - say Y and read the Ethernet-HOWTO, available from - . - - This driver also works for the following NE2000 clone cards: - RealTek RTL-8029 Winbond 89C940 Compex RL2000 KTI ET32P2 - NetVin NV5000SC Via 86C926 SureCom NE34 Winbond - Holtek HT80232 Holtek HT80229 - - To compile this driver as a module, choose M here. The module - will be called ne2k-pci. - -config NE3210 - tristate "Novell/Eagle/Microdyne NE3210 EISA 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 - . Note that this driver - will NOT WORK for NE3200 cards as they are completely different. - - To compile this driver as a module, choose M here. The module - will be called ne3210. - -config ES3210 - tristate "Racal-Interlan EISA ES3210 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 - . - - To compile this driver as a module, choose M here. The module - will be called es3210. - config 8139CP tristate "RealTek RTL-8139 C+ PCI Fast Ethernet Adapter support (EXPERIMENTAL)" depends on NET_PCI && PCI && EXPERIMENTAL @@ -1723,13 +1447,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 diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 59b6cc932037..4e8fa7372242 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -65,7 +65,6 @@ obj-$(CONFIG_SUNVNET) += sunvnet.o obj-$(CONFIG_MACE) += mace.o obj-$(CONFIG_BMAC) += bmac.o -obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o obj-$(CONFIG_E100) += e100.o obj-$(CONFIG_TLAN) += tlan.o obj-$(CONFIG_EPIC100) += epic100.o @@ -77,7 +76,6 @@ obj-$(CONFIG_YELLOWFIN) += yellowfin.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 @@ -112,9 +110,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 @@ -122,24 +117,9 @@ obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx.o ifeq ($(CONFIG_FEC_MPC52xx_MDIO),y) obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx_phy.o endif -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 -obj-$(CONFIG_AX88796) += ax88796.o obj-$(CONFIG_BCM63XX_ENET) += bcm63xx_enet.o obj-$(CONFIG_FTGMAC100) += ftgmac100.o obj-$(CONFIG_FTMAC100) += ftmac100.o @@ -195,7 +175,6 @@ obj-$(CONFIG_ATP) += atp.o obj-$(CONFIG_NI5010) += ni5010.o obj-$(CONFIG_NI52) += ni52.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 @@ -207,13 +186,11 @@ obj-$(CONFIG_SC92031) += sc92031.o obj-$(CONFIG_LP486E) += lp486e.o obj-$(CONFIG_ETH16I) += eth16i.o -obj-$(CONFIG_ZORRO8390) += zorro8390.o obj-$(CONFIG_EQUALIZER) += eql.o obj-$(CONFIG_KORINA) += korina.o obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o -obj-$(CONFIG_HYDRA) += hydra.o obj-$(CONFIG_CS89x0) += cs89x0.o obj-$(CONFIG_MACSONIC) += macsonic.o obj-$(CONFIG_MACMACE) += macmace.o diff --git a/drivers/net/arm/Kconfig b/drivers/net/arm/Kconfig index d0c8cf254cb0..715bf2acc24b 100644 --- a/drivers/net/arm/Kconfig +++ b/drivers/net/arm/Kconfig @@ -17,14 +17,6 @@ config ARM_ETHER3 If you have an Acorn system with one of these network cards, you should say Y to this option if you wish to use it with Linux. -config ARM_ETHERH - tristate "I-cubed EtherH/ANT EtherM support" - depends on ARM && ARCH_ACORN - select CRC32 - help - If you have an Acorn system with one of these network cards, you - should say Y to this option if you wish to use it with Linux. - config ARM_AT91_ETHER tristate "AT91RM9200 Ethernet support" depends on ARM && ARCH_AT91RM9200 diff --git a/drivers/net/arm/Makefile b/drivers/net/arm/Makefile index 63c57be34abf..f1e6150b6757 100644 --- a/drivers/net/arm/Makefile +++ b/drivers/net/arm/Makefile @@ -3,7 +3,6 @@ # Makefile for the ARM network device drivers # -obj-$(CONFIG_ARM_ETHERH) += etherh.o obj-$(CONFIG_ARM_ETHER3) += ether3.o obj-$(CONFIG_ARM_ETHER1) += ether1.o obj-$(CONFIG_ARM_AT91_ETHER) += at91_ether.o diff --git a/drivers/net/3c503.c b/drivers/net/ethernet/8390/3c503.c similarity index 100% rename from drivers/net/3c503.c rename to drivers/net/ethernet/8390/3c503.c diff --git a/drivers/net/3c503.h b/drivers/net/ethernet/8390/3c503.h similarity index 100% rename from drivers/net/3c503.h rename to drivers/net/ethernet/8390/3c503.h diff --git a/drivers/net/8390.c b/drivers/net/ethernet/8390/8390.c similarity index 100% rename from drivers/net/8390.c rename to drivers/net/ethernet/8390/8390.c diff --git a/drivers/net/8390.h b/drivers/net/ethernet/8390/8390.h similarity index 100% rename from drivers/net/8390.h rename to drivers/net/ethernet/8390/8390.h diff --git a/drivers/net/8390p.c b/drivers/net/ethernet/8390/8390p.c similarity index 100% rename from drivers/net/8390p.c rename to drivers/net/ethernet/8390/8390p.c diff --git a/drivers/net/ethernet/8390/Kconfig b/drivers/net/ethernet/8390/Kconfig new file mode 100644 index 000000000000..5cd53f1b84d3 --- /dev/null +++ b/drivers/net/ethernet/8390/Kconfig @@ -0,0 +1,348 @@ +# +# 8390 device configuration +# + +config NET_VENDOR_8390 + bool "National Semi-conductor 8390 devices" + depends on AMIGA_PCMCIA || PCI || SUPERH || ISA || MCA || EISA || \ + MAC || M32R || MACH_TX49XX || MCA_LEGACY || H8300 || \ + ARM || MIPS || ZORRO || PCMCIA || EXPERIMENTAL + ---help--- + If you have a network (Ethernet) card belonging to this class, say Y + and read the Ethernet-HOWTO, available from + . + + 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. + +if NET_VENDOR_8390 + +config EL2 + tristate "3c503 \"EtherLink II\" support" + depends on ISA + select CRC32 + ---help--- + If you have a network (Ethernet) card of this type, say Y and read + the Ethernet-HOWTO, available from + . + + To compile this driver as a module, choose M here. The module + will be called 3c503. + +config AC3200 + tristate "Ansel Communications EISA 3200 support (EXPERIMENTAL)" + depends on PCI && (ISA || EISA) && EXPERIMENTAL + select CRC32 + ---help--- + If you have a network (Ethernet) card of this type, say Y and read + the Ethernet-HOWTO, available from + . + + To compile this driver as a module, choose M here. The module + will be called ac3200. + +config PCMCIA_AXNET + tristate "Asix AX88190 PCMCIA support" + depends on PCMCIA + ---help--- + Say Y here if you intend to attach an Asix AX88190-based PCMCIA + (PC-card) Fast Ethernet card to your computer. These cards are + nearly NE2000 compatible but need a separate driver due to a few + misfeatures. + + To compile this driver as a module, choose M here: the module will be + called axnet_cs. If unsure, say N. + +config AX88796 + tristate "ASIX AX88796 NE2000 clone support" + depends on (ARM || MIPS || SUPERH) + select PHYLIB + select MDIO_BITBANG + ---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 E2100 + tristate "Cabletron E21xx support" + depends on ISA + select CRC32 + ---help--- + If you have a network (Ethernet) card of this type, say Y and read + the Ethernet-HOWTO, available from + . + + To compile this driver as a module, choose M here. The module + will be called e2100. + +config ES3210 + tristate "Racal-Interlan EISA ES3210 support (EXPERIMENTAL)" + depends on 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 + . + + To compile this driver as a module, choose M here. The module + will be called es3210. + +config HPLAN_PLUS + tristate "HP PCLAN+ (27247B and 27252A) support" + depends on ISA + select CRC32 + ---help--- + If you have a network (Ethernet) card of this type, say Y and read + the Ethernet-HOWTO, available from + . + + 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 ISA + select CRC32 + ---help--- + If you have a network (Ethernet) card of this type, say Y and read + the Ethernet-HOWTO, available from + . + + To compile this driver as a module, choose M here. The module + will be called hp. + +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 ARM_ETHERH + tristate "I-cubed EtherH/ANT EtherM support" + depends on ARM && ARCH_ACORN + select CRC32 + ---help--- + If you have an Acorn system with one of these network cards, you + should say Y to this option if you wish to use it with Linux. + +config LNE390 + tristate "Mylex EISA LNE390A/B support (EXPERIMENTAL)" + depends on 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 + . + + To compile this driver as a module, choose M here. The module + will be called lne390. + +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 + . + +config NE2000 + tristate "NE2000/NE1000 support" + 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 + the Ethernet-HOWTO, available from + . 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 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 + . + + To compile this driver as a module, choose M here. The module + will be called ne2. + +config NE2K_PCI + tristate "PCI NE2000 and clones support (see help)" + depends on PCI + select CRC32 + ---help--- + This driver is for NE2000 compatible PCI cards. It will not work + with ISA NE2000 cards (they have their own driver, "NE2000/NE1000 + support" below). If you have a PCI NE2000 network (Ethernet) card, + say Y and read the Ethernet-HOWTO, available from + . + + This driver also works for the following NE2000 clone cards: + RealTek RTL-8029 Winbond 89C940 Compex RL2000 KTI ET32P2 + NetVin NV5000SC Via 86C926 SureCom NE34 Winbond + Holtek HT80232 Holtek HT80229 + + To compile this driver as a module, choose M here. The module + will be called ne2k-pci. + +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 NE3210 + tristate "Novell/Eagle/Microdyne NE3210 EISA support (EXPERIMENTAL)" + depends on 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 + . Note that this driver + will NOT WORK for NE3200 cards as they are completely different. + + To compile this driver as a module, choose M here. The module + will be called ne3210. + +config PCMCIA_PCNET + tristate "NE2000 compatible PCMCIA support" + depends on PCMCIA + select CRC32 + ---help--- + Say Y here if you intend to attach an NE2000 compatible PCMCIA + (PC-card) Ethernet or Fast Ethernet card to your computer. + + To compile this driver as a module, choose M here: the module will be + called pcnet_cs. If unsure, say N. + +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 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 + . + + If unsure, say N. + +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 + . + + 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 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 . + + 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 + . + + 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 + . + + To compile this driver as a module, choose M here. The module + will be called smc-ultra32. + +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 + . + + To compile this driver as a module, choose M here. The module + will be called wd. + +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. + +endif # NET_VENDOR_8390 diff --git a/drivers/net/ethernet/8390/Makefile b/drivers/net/ethernet/8390/Makefile new file mode 100644 index 000000000000..3337d7fb4344 --- /dev/null +++ b/drivers/net/ethernet/8390/Makefile @@ -0,0 +1,29 @@ +# +# Makefile for the 8390 network device drivers. +# + +obj-$(CONFIG_MAC8390) += mac8390.o +obj-$(CONFIG_AC3200) += ac3200.o 8390.o +obj-$(CONFIG_APNE) += apne.o 8390.o +obj-$(CONFIG_ARM_ETHERH) += etherh.o +obj-$(CONFIG_AX88796) += ax88796.o +obj-$(CONFIG_E2100) += e2100.o 8390.o +obj-$(CONFIG_EL2) += 3c503.o 8390p.o +obj-$(CONFIG_ES3210) += es3210.o 8390.o +obj-$(CONFIG_HPLAN_PLUS) += hp-plus.o 8390p.o +obj-$(CONFIG_HPLAN) += hp.o 8390p.o +obj-$(CONFIG_HYDRA) += hydra.o 8390.o +obj-$(CONFIG_LNE390) += lne390.o 8390.o +obj-$(CONFIG_NE2000) += ne.o 8390p.o +obj-$(CONFIG_NE2_MCA) += ne2.o 8390p.o +obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o +obj-$(CONFIG_NE3210) += ne3210.o 8390.o +obj-$(CONFIG_NE_H8300) += ne-h8300.o 8390.o +obj-$(CONFIG_PCMCIA_AXNET) += axnet_cs.o 8390.o +obj-$(CONFIG_PCMCIA_PCNET) += pcnet_cs.o 8390.o +obj-$(CONFIG_STNIC) += stnic.o 8390.o +obj-$(CONFIG_ULTRA) += smc-ultra.o 8390.o +obj-$(CONFIG_ULTRA32) += smc-ultra32.o 8390.o +obj-$(CONFIG_ULTRAMCA) += smc-mca.o 8390.o +obj-$(CONFIG_WD80x3) += wd.o 8390.o +obj-$(CONFIG_ZORRO8390) += zorro8390.o 8390.o diff --git a/drivers/net/ac3200.c b/drivers/net/ethernet/8390/ac3200.c similarity index 100% rename from drivers/net/ac3200.c rename to drivers/net/ethernet/8390/ac3200.c diff --git a/drivers/net/apne.c b/drivers/net/ethernet/8390/apne.c similarity index 100% rename from drivers/net/apne.c rename to drivers/net/ethernet/8390/apne.c diff --git a/drivers/net/ax88796.c b/drivers/net/ethernet/8390/ax88796.c similarity index 100% rename from drivers/net/ax88796.c rename to drivers/net/ethernet/8390/ax88796.c diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/ethernet/8390/axnet_cs.c similarity index 99% rename from drivers/net/pcmcia/axnet_cs.c rename to drivers/net/ethernet/8390/axnet_cs.c index 9953db711969..3e4b926c30dc 100644 --- a/drivers/net/pcmcia/axnet_cs.c +++ b/drivers/net/ethernet/8390/axnet_cs.c @@ -38,7 +38,7 @@ #include #include #include -#include "../8390.h" +#include "8390.h" #include #include diff --git a/drivers/net/e2100.c b/drivers/net/ethernet/8390/e2100.c similarity index 100% rename from drivers/net/e2100.c rename to drivers/net/ethernet/8390/e2100.c diff --git a/drivers/net/es3210.c b/drivers/net/ethernet/8390/es3210.c similarity index 100% rename from drivers/net/es3210.c rename to drivers/net/ethernet/8390/es3210.c diff --git a/drivers/net/arm/etherh.c b/drivers/net/ethernet/8390/etherh.c similarity index 99% rename from drivers/net/arm/etherh.c rename to drivers/net/ethernet/8390/etherh.c index 03e217a868d4..cf851faef311 100644 --- a/drivers/net/arm/etherh.c +++ b/drivers/net/ethernet/8390/etherh.c @@ -65,7 +65,7 @@ static char version[] __initdata = "EtherH/EtherM Driver (c) 2002-2004 Russell King " DRV_VERSION "\n"; -#include "../lib8390.c" +#include "lib8390.c" static unsigned int net_debug = NET_DEBUG; diff --git a/drivers/net/hp-plus.c b/drivers/net/ethernet/8390/hp-plus.c similarity index 100% rename from drivers/net/hp-plus.c rename to drivers/net/ethernet/8390/hp-plus.c diff --git a/drivers/net/hp.c b/drivers/net/ethernet/8390/hp.c similarity index 100% rename from drivers/net/hp.c rename to drivers/net/ethernet/8390/hp.c diff --git a/drivers/net/hydra.c b/drivers/net/ethernet/8390/hydra.c similarity index 100% rename from drivers/net/hydra.c rename to drivers/net/ethernet/8390/hydra.c diff --git a/drivers/net/lib8390.c b/drivers/net/ethernet/8390/lib8390.c similarity index 100% rename from drivers/net/lib8390.c rename to drivers/net/ethernet/8390/lib8390.c diff --git a/drivers/net/lne390.c b/drivers/net/ethernet/8390/lne390.c similarity index 100% rename from drivers/net/lne390.c rename to drivers/net/ethernet/8390/lne390.c diff --git a/drivers/net/mac8390.c b/drivers/net/ethernet/8390/mac8390.c similarity index 100% rename from drivers/net/mac8390.c rename to drivers/net/ethernet/8390/mac8390.c diff --git a/drivers/net/ne-h8300.c b/drivers/net/ethernet/8390/ne-h8300.c similarity index 100% rename from drivers/net/ne-h8300.c rename to drivers/net/ethernet/8390/ne-h8300.c diff --git a/drivers/net/ne.c b/drivers/net/ethernet/8390/ne.c similarity index 100% rename from drivers/net/ne.c rename to drivers/net/ethernet/8390/ne.c diff --git a/drivers/net/ne2.c b/drivers/net/ethernet/8390/ne2.c similarity index 100% rename from drivers/net/ne2.c rename to drivers/net/ethernet/8390/ne2.c diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ethernet/8390/ne2k-pci.c similarity index 100% rename from drivers/net/ne2k-pci.c rename to drivers/net/ethernet/8390/ne2k-pci.c diff --git a/drivers/net/ne3210.c b/drivers/net/ethernet/8390/ne3210.c similarity index 100% rename from drivers/net/ne3210.c rename to drivers/net/ethernet/8390/ne3210.c diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/ethernet/8390/pcnet_cs.c similarity index 99% rename from drivers/net/pcmcia/pcnet_cs.c rename to drivers/net/ethernet/8390/pcnet_cs.c index b4fd7c3ed077..40107614b5dc 100644 --- a/drivers/net/pcmcia/pcnet_cs.c +++ b/drivers/net/ethernet/8390/pcnet_cs.c @@ -41,7 +41,7 @@ #include #include #include -#include "../8390.h" +#include "8390.h" #include #include diff --git a/drivers/net/smc-mca.c b/drivers/net/ethernet/8390/smc-mca.c similarity index 100% rename from drivers/net/smc-mca.c rename to drivers/net/ethernet/8390/smc-mca.c diff --git a/drivers/net/smc-ultra.c b/drivers/net/ethernet/8390/smc-ultra.c similarity index 100% rename from drivers/net/smc-ultra.c rename to drivers/net/ethernet/8390/smc-ultra.c diff --git a/drivers/net/smc-ultra32.c b/drivers/net/ethernet/8390/smc-ultra32.c similarity index 100% rename from drivers/net/smc-ultra32.c rename to drivers/net/ethernet/8390/smc-ultra32.c diff --git a/drivers/net/stnic.c b/drivers/net/ethernet/8390/stnic.c similarity index 100% rename from drivers/net/stnic.c rename to drivers/net/ethernet/8390/stnic.c diff --git a/drivers/net/wd.c b/drivers/net/ethernet/8390/wd.c similarity index 100% rename from drivers/net/wd.c rename to drivers/net/ethernet/8390/wd.c diff --git a/drivers/net/zorro8390.c b/drivers/net/ethernet/8390/zorro8390.c similarity index 100% rename from drivers/net/zorro8390.c rename to drivers/net/ethernet/8390/zorro8390.c diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index 5e62efd58172..56ed5ec9a503 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -12,6 +12,7 @@ menuconfig ETHERNET if ETHERNET source "drivers/net/ethernet/3com/Kconfig" +source "drivers/net/ethernet/8390/Kconfig" source "drivers/net/ethernet/amd/Kconfig" endif # ETHERNET diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 1bc2ac25bab0..fc82588fb2f4 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -3,4 +3,5 @@ # obj-$(CONFIG_NET_VENDOR_3COM) += 3com/ +obj-$(CONFIG_NET_VENDOR_8390) += 8390/ obj-$(CONFIG_NET_VENDOR_AMD) += amd/ diff --git a/drivers/net/pcmcia/Kconfig b/drivers/net/pcmcia/Kconfig index e17ad95f6668..72aa25786a95 100644 --- a/drivers/net/pcmcia/Kconfig +++ b/drivers/net/pcmcia/Kconfig @@ -31,16 +31,6 @@ config PCMCIA_FMVJ18X To compile this driver as a module, choose M here: the module will be called fmvj18x_cs. If unsure, say N. -config PCMCIA_PCNET - tristate "NE2000 compatible PCMCIA support" - select CRC32 - help - Say Y here if you intend to attach an NE2000 compatible PCMCIA - (PC-card) Ethernet or Fast Ethernet card to your computer. - - To compile this driver as a module, choose M here: the module will be - called pcnet_cs. If unsure, say N. - config PCMCIA_SMC91C92 tristate "SMC 91Cxx PCMCIA support" select CRC32 @@ -61,17 +51,6 @@ config PCMCIA_XIRC2PS To compile this driver as a module, choose M here: the module will be called xirc2ps_cs. If unsure, say N. -config PCMCIA_AXNET - tristate "Asix AX88190 PCMCIA support" - ---help--- - Say Y here if you intend to attach an Asix AX88190-based PCMCIA - (PC-card) Fast Ethernet card to your computer. These cards are - nearly NE2000 compatible but need a separate driver due to a few - misfeatures. - - To compile this driver as a module, choose M here: the module will be - called axnet_cs. If unsure, say N. - config ARCNET_COM20020_CS tristate "COM20020 ARCnet PCMCIA support" depends on ARCNET_COM20020 diff --git a/drivers/net/pcmcia/Makefile b/drivers/net/pcmcia/Makefile index 985f0ae37f8f..c2b8b44c7bb1 100644 --- a/drivers/net/pcmcia/Makefile +++ b/drivers/net/pcmcia/Makefile @@ -4,10 +4,8 @@ # 16-bit client drivers obj-$(CONFIG_PCMCIA_FMVJ18X) += fmvj18x_cs.o -obj-$(CONFIG_PCMCIA_PCNET) += pcnet_cs.o obj-$(CONFIG_PCMCIA_SMC91C92) += smc91c92_cs.o obj-$(CONFIG_PCMCIA_XIRC2PS) += xirc2ps_cs.o obj-$(CONFIG_ARCNET_COM20020_CS)+= com20020_cs.o -obj-$(CONFIG_PCMCIA_AXNET) += axnet_cs.o obj-$(CONFIG_PCMCIA_IBMTR) += ibmtr_cs.o From adfc5217e9db68d3f0cec8dd847c1a6d3ab549ee Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Thu, 7 Apr 2011 06:03:04 -0700 Subject: [PATCH 05/10] broadcom: Move the Broadcom drivers Moves the drivers for Broadcom devices into drivers/net/ethernet/broadcom/ and the necessary Kconfig and Makefile changes. CC: Eilon Greenstein CC: Michael Chan CC: Matt Carlson CC: Gary Zambrano CC: "Maciej W. Rozycki" Signed-off-by: Jeff Kirsher --- MAINTAINERS | 10 +- drivers/net/Kconfig | 99 --------------- drivers/net/Makefile | 7 -- drivers/net/ethernet/Kconfig | 1 + drivers/net/ethernet/Makefile | 1 + drivers/net/ethernet/broadcom/Kconfig | 119 ++++++++++++++++++ drivers/net/ethernet/broadcom/Makefile | 11 ++ drivers/net/{ => ethernet/broadcom}/b44.c | 0 drivers/net/{ => ethernet/broadcom}/b44.h | 0 .../{ => ethernet/broadcom}/bcm63xx_enet.c | 0 .../{ => ethernet/broadcom}/bcm63xx_enet.h | 0 drivers/net/{ => ethernet/broadcom}/bnx2.c | 0 drivers/net/{ => ethernet/broadcom}/bnx2.h | 0 drivers/net/{ => ethernet/broadcom}/bnx2_fw.h | 0 .../{ => ethernet/broadcom}/bnx2x/Makefile | 0 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x.h | 0 .../{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c | 0 .../{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h | 0 .../{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c | 0 .../{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h | 0 .../broadcom}/bnx2x/bnx2x_dump.h | 0 .../broadcom}/bnx2x/bnx2x_ethtool.c | 0 .../broadcom}/bnx2x/bnx2x_fw_defs.h | 0 .../broadcom}/bnx2x/bnx2x_fw_file_hdr.h | 0 .../{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h | 0 .../broadcom}/bnx2x/bnx2x_init.h | 0 .../broadcom}/bnx2x/bnx2x_init_ops.h | 0 .../broadcom}/bnx2x/bnx2x_link.c | 0 .../broadcom}/bnx2x/bnx2x_link.h | 0 .../broadcom}/bnx2x/bnx2x_main.c | 0 .../{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h | 0 .../{ => ethernet/broadcom}/bnx2x/bnx2x_sp.c | 0 .../{ => ethernet/broadcom}/bnx2x/bnx2x_sp.h | 0 .../broadcom}/bnx2x/bnx2x_stats.c | 0 .../broadcom}/bnx2x/bnx2x_stats.h | 0 drivers/net/{ => ethernet/broadcom}/cnic.c | 4 +- drivers/net/{ => ethernet/broadcom}/cnic.h | 0 .../net/{ => ethernet/broadcom}/cnic_defs.h | 0 drivers/net/{ => ethernet/broadcom}/cnic_if.h | 0 .../net/{ => ethernet/broadcom}/sb1250-mac.c | 0 drivers/net/{ => ethernet/broadcom}/tg3.c | 0 drivers/net/{ => ethernet/broadcom}/tg3.h | 0 drivers/scsi/bnx2fc/bnx2fc.h | 2 +- drivers/scsi/bnx2i/bnx2i.h | 2 +- 44 files changed, 141 insertions(+), 115 deletions(-) create mode 100644 drivers/net/ethernet/broadcom/Kconfig create mode 100644 drivers/net/ethernet/broadcom/Makefile rename drivers/net/{ => ethernet/broadcom}/b44.c (100%) rename drivers/net/{ => ethernet/broadcom}/b44.h (100%) rename drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.c (100%) rename drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.h (100%) rename drivers/net/{ => ethernet/broadcom}/bnx2.c (100%) rename drivers/net/{ => ethernet/broadcom}/bnx2.h (100%) rename drivers/net/{ => ethernet/broadcom}/bnx2_fw.h (100%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/Makefile (100%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x.h (100%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c (100%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h (100%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c (100%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h (100%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dump.h (100%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_ethtool.c (100%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_fw_defs.h (100%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_fw_file_hdr.h (100%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h (100%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_init.h (100%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_init_ops.h (100%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.c (100%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.h (100%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_main.c (100%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h (100%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.c (100%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.h (100%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_stats.c (100%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_stats.h (100%) rename drivers/net/{ => ethernet/broadcom}/cnic.c (99%) rename drivers/net/{ => ethernet/broadcom}/cnic.h (100%) rename drivers/net/{ => ethernet/broadcom}/cnic_defs.h (100%) rename drivers/net/{ => ethernet/broadcom}/cnic_if.h (100%) rename drivers/net/{ => ethernet/broadcom}/sb1250-mac.c (100%) rename drivers/net/{ => ethernet/broadcom}/tg3.c (100%) rename drivers/net/{ => ethernet/broadcom}/tg3.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index c6945830ea46..af9de64d89aa 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1526,27 +1526,27 @@ BROADCOM B44 10/100 ETHERNET DRIVER M: Gary Zambrano L: netdev@vger.kernel.org S: Supported -F: drivers/net/b44.* +F: drivers/net/ethernet/broadcom/b44.* BROADCOM BNX2 GIGABIT ETHERNET DRIVER M: Michael Chan L: netdev@vger.kernel.org S: Supported -F: drivers/net/bnx2.* -F: drivers/net/bnx2_* +F: drivers/net/ethernet/broadcom/bnx2.* +F: drivers/net/ethernet/broadcom/bnx2_* BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER M: Eilon Greenstein L: netdev@vger.kernel.org S: Supported -F: drivers/net/bnx2x/ +F: drivers/net/ethernet/broadcom/bnx2x/ BROADCOM TG3 GIGABIT ETHERNET DRIVER M: Matt Carlson M: Michael Chan L: netdev@vger.kernel.org S: Supported -F: drivers/net/tg3.* +F: drivers/net/ethernet/broadcom/tg3.* BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER M: Brett Rudley diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index c877f4114e04..2f9f208472de 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -997,38 +997,6 @@ config APRICOT To compile this driver as a module, choose M here. The module will be called apricot. -config B44 - tristate "Broadcom 440x/47xx ethernet support" - depends on SSB_POSSIBLE && HAS_DMA - select SSB - select MII - help - If you have a network (Ethernet) controller of this type, say Y - or M and read the Ethernet-HOWTO, available from - . - - To compile this driver as a module, choose M here. The module - will be called b44. - -# Auto-select SSB PCI-HOST support, if possible -config B44_PCI_AUTOSELECT - bool - depends on B44 && SSB_PCIHOST_POSSIBLE - select SSB_PCIHOST - default y - -# Auto-select SSB PCICORE driver, if possible -config B44_PCICORE_AUTOSELECT - bool - depends on B44 && SSB_DRIVER_PCICORE_POSSIBLE - select SSB_DRIVER_PCICORE - default y - -config B44_PCI - bool - depends on B44_PCI_AUTOSELECT && B44_PCICORE_AUTOSELECT - default y - config FORCEDETH tristate "nForce Ethernet support" depends on NET_PCI && PCI @@ -1465,15 +1433,6 @@ config XILINX_EMACLITE help This driver supports the 10/100 Ethernet Lite from Xilinx. -config BCM63XX_ENET - tristate "Broadcom 63xx internal mac support" - depends on BCM63XX - select MII - select PHYLIB - help - This driver supports the ethernet MACs in the Broadcom 63xx - MIPS chipset family (BCM63XX). - config FTMAC100 tristate "Faraday FTMAC100 10/100 Ethernet support" depends on ARM @@ -1683,19 +1642,6 @@ config R8169 To compile this driver as a module, choose M here: the module will be called r8169. This is recommended. -config SB1250_MAC - tristate "SB1250 Gigabit Ethernet support" - depends on SIBYTE_SB1xxx_SOC - select PHYLIB - ---help--- - This driver supports Gigabit Ethernet interfaces based on the - Broadcom SiByte family of System-On-a-Chip parts. They include - the BCM1120, BCM1125, BCM1125H, BCM1250, BCM1255, BCM1280, BCM1455 - and BCM1480 chips. - - To compile this driver as a module, choose M here: the module - will be called sb1250-mac. - config SIS190 tristate "SiS190/SiS191 gigabit ethernet support" depends on PCI @@ -1789,39 +1735,6 @@ config VIA_VELOCITY To compile this driver as a module, choose M here. The module will be called via-velocity. -config TIGON3 - tristate "Broadcom Tigon3 support" - depends on PCI - select PHYLIB - help - This driver supports Broadcom Tigon3 based gigabit Ethernet cards. - - To compile this driver as a module, choose M here: the module - will be called tg3. This is recommended. - -config BNX2 - tristate "Broadcom NetXtremeII support" - depends on PCI - select CRC32 - select FW_LOADER - help - This driver supports Broadcom NetXtremeII gigabit Ethernet cards. - - To compile this driver as a module, choose M here: the module - will be called bnx2. This is recommended. - -config CNIC - tristate "Broadcom CNIC support" - depends on PCI - select BNX2 - select UIO - help - This driver supports offload features of Broadcom NetXtremeII - gigabit Ethernet cards. - - To compile this driver as a module, choose M here: the module - will be called cnic. This is recommended. - config SPIDER_NET tristate "Spider Gigabit Ethernet driver" depends on PCI && (PPC_IBM_CELL_BLADE || PPC_CELLEB) @@ -2327,18 +2240,6 @@ config TEHUTI help Tehuti Networks 10G Ethernet NIC -config BNX2X - tristate "Broadcom NetXtremeII 10Gb support" - depends on PCI - select FW_LOADER - select ZLIB_INFLATE - select LIBCRC32C - select MDIO - help - This driver supports Broadcom NetXtremeII 10 gigabit Ethernet cards. - To compile this driver as a module, choose M here: the module - will be called bnx2x. This is recommended. - config QLCNIC tristate "QLOGIC QLCNIC 1/10Gb Converged Ethernet NIC Support" depends on PCI diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 4e8fa7372242..4cc2dcd3e0bd 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -77,10 +77,6 @@ obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o obj-$(CONFIG_NATSEMI) += natsemi.o obj-$(CONFIG_NS83820) += ns83820.o obj-$(CONFIG_FEALNX) += fealnx.o -obj-$(CONFIG_TIGON3) += tg3.o -obj-$(CONFIG_BNX2) += bnx2.o -obj-$(CONFIG_CNIC) += cnic.o -obj-$(CONFIG_BNX2X) += bnx2x/ spidernet-y += spider_net.o spider_net_ethtool.o obj-$(CONFIG_SPIDER_NET) += spidernet.o sungem_phy.o obj-$(CONFIG_GELIC_NET) += ps3_gelic.o @@ -117,10 +113,7 @@ obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx.o ifeq ($(CONFIG_FEC_MPC52xx_MDIO),y) obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx_phy.o endif -obj-$(CONFIG_SB1250_MAC) += sb1250-mac.o -obj-$(CONFIG_B44) += b44.o obj-$(CONFIG_FORCEDETH) += forcedeth.o -obj-$(CONFIG_BCM63XX_ENET) += bcm63xx_enet.o obj-$(CONFIG_FTGMAC100) += ftgmac100.o obj-$(CONFIG_FTMAC100) += ftmac100.o diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index 56ed5ec9a503..772fb49b4b3f 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -14,5 +14,6 @@ if ETHERNET source "drivers/net/ethernet/3com/Kconfig" source "drivers/net/ethernet/8390/Kconfig" source "drivers/net/ethernet/amd/Kconfig" +source "drivers/net/ethernet/broadcom/Kconfig" endif # ETHERNET diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index fc82588fb2f4..3ef49a2bae06 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -5,3 +5,4 @@ obj-$(CONFIG_NET_VENDOR_3COM) += 3com/ obj-$(CONFIG_NET_VENDOR_8390) += 8390/ obj-$(CONFIG_NET_VENDOR_AMD) += amd/ +obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/ diff --git a/drivers/net/ethernet/broadcom/Kconfig b/drivers/net/ethernet/broadcom/Kconfig new file mode 100644 index 000000000000..8986e57d7f9c --- /dev/null +++ b/drivers/net/ethernet/broadcom/Kconfig @@ -0,0 +1,119 @@ +# +# Broadcom device configuration +# + +config NET_VENDOR_BROADCOM + bool "Broadcom devices" + depends on (SSB_POSSIBLE && HAS_DMA) || PCI || BCM63XX || \ + SIBYTE_SB1xxx_SOC + ---help--- + If you have a network (Ethernet) chipset belonging to this class, + say Y. + + Note that the answer to this question does not directly affect + the kernel: saying N will just case the configurator to skip all + the questions regarding AMD chipsets. If you say Y, you will be asked + for your specific chipset/driver in the following questions. + +if NET_VENDOR_BROADCOM + +config B44 + tristate "Broadcom 440x/47xx ethernet support" + depends on SSB_POSSIBLE && HAS_DMA + select SSB + select MII + ---help--- + If you have a network (Ethernet) controller of this type, say Y + or M and read the Ethernet-HOWTO, available from + . + + To compile this driver as a module, choose M here. The module + will be called b44. + +# Auto-select SSB PCI-HOST support, if possible +config B44_PCI_AUTOSELECT + bool + depends on B44 && SSB_PCIHOST_POSSIBLE + select SSB_PCIHOST + default y + +# Auto-select SSB PCICORE driver, if possible +config B44_PCICORE_AUTOSELECT + bool + depends on B44 && SSB_DRIVER_PCICORE_POSSIBLE + select SSB_DRIVER_PCICORE + default y + +config B44_PCI + bool + depends on B44_PCI_AUTOSELECT && B44_PCICORE_AUTOSELECT + default y + +config BCM63XX_ENET + tristate "Broadcom 63xx internal mac support" + depends on BCM63XX + select MII + select PHYLIB + help + This driver supports the ethernet MACs in the Broadcom 63xx + MIPS chipset family (BCM63XX). + +config BNX2 + tristate "Broadcom NetXtremeII support" + depends on PCI + select CRC32 + select FW_LOADER + ---help--- + This driver supports Broadcom NetXtremeII gigabit Ethernet cards. + + To compile this driver as a module, choose M here: the module + will be called bnx2. This is recommended. + +config CNIC + tristate "Broadcom CNIC support" + depends on PCI + select BNX2 + select UIO + ---help--- + This driver supports offload features of Broadcom NetXtremeII + gigabit Ethernet cards. + + To compile this driver as a module, choose M here: the module + will be called cnic. This is recommended. + +config SB1250_MAC + tristate "SB1250 Gigabit Ethernet support" + depends on SIBYTE_SB1xxx_SOC + select PHYLIB + ---help--- + This driver supports Gigabit Ethernet interfaces based on the + Broadcom SiByte family of System-On-a-Chip parts. They include + the BCM1120, BCM1125, BCM1125H, BCM1250, BCM1255, BCM1280, BCM1455 + and BCM1480 chips. + + To compile this driver as a module, choose M here: the module + will be called sb1250-mac. + +config TIGON3 + tristate "Broadcom Tigon3 support" + depends on PCI + select PHYLIB + ---help--- + This driver supports Broadcom Tigon3 based gigabit Ethernet cards. + + To compile this driver as a module, choose M here: the module + will be called tg3. This is recommended. + +config BNX2X + tristate "Broadcom NetXtremeII 10Gb support" + depends on PCI + select FW_LOADER + select ZLIB_INFLATE + select LIBCRC32C + select MDIO + ---help--- + This driver supports Broadcom NetXtremeII 10 gigabit Ethernet cards. + To compile this driver as a module, choose M here: the module + will be called bnx2x. This is recommended. + +endif # NET_VENDOR_BROADCOM diff --git a/drivers/net/ethernet/broadcom/Makefile b/drivers/net/ethernet/broadcom/Makefile new file mode 100644 index 000000000000..b7896051d54e --- /dev/null +++ b/drivers/net/ethernet/broadcom/Makefile @@ -0,0 +1,11 @@ +# +# Makefile for the Broadcom network device drivers. +# + +obj-$(CONFIG_B44) += b44.o +obj-$(CONFIG_BCM63XX_ENET) += bcm63xx_enet.o +obj-$(CONFIG_BNX2) += bnx2.o +obj-$(CONFIG_CNIC) += cnic.o +obj-$(CONFIG_BNX2X) += bnx2x/ +obj-$(CONFIG_SB1250_MAC) += sb1250-mac.o +obj-$(CONFIG_TIGON3) += tg3.o diff --git a/drivers/net/b44.c b/drivers/net/ethernet/broadcom/b44.c similarity index 100% rename from drivers/net/b44.c rename to drivers/net/ethernet/broadcom/b44.c diff --git a/drivers/net/b44.h b/drivers/net/ethernet/broadcom/b44.h similarity index 100% rename from drivers/net/b44.h rename to drivers/net/ethernet/broadcom/b44.h diff --git a/drivers/net/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c similarity index 100% rename from drivers/net/bcm63xx_enet.c rename to drivers/net/ethernet/broadcom/bcm63xx_enet.c diff --git a/drivers/net/bcm63xx_enet.h b/drivers/net/ethernet/broadcom/bcm63xx_enet.h similarity index 100% rename from drivers/net/bcm63xx_enet.h rename to drivers/net/ethernet/broadcom/bcm63xx_enet.h diff --git a/drivers/net/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c similarity index 100% rename from drivers/net/bnx2.c rename to drivers/net/ethernet/broadcom/bnx2.c diff --git a/drivers/net/bnx2.h b/drivers/net/ethernet/broadcom/bnx2.h similarity index 100% rename from drivers/net/bnx2.h rename to drivers/net/ethernet/broadcom/bnx2.h diff --git a/drivers/net/bnx2_fw.h b/drivers/net/ethernet/broadcom/bnx2_fw.h similarity index 100% rename from drivers/net/bnx2_fw.h rename to drivers/net/ethernet/broadcom/bnx2_fw.h diff --git a/drivers/net/bnx2x/Makefile b/drivers/net/ethernet/broadcom/bnx2x/Makefile similarity index 100% rename from drivers/net/bnx2x/Makefile rename to drivers/net/ethernet/broadcom/bnx2x/Makefile diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h similarity index 100% rename from drivers/net/bnx2x/bnx2x.h rename to drivers/net/ethernet/broadcom/bnx2x/bnx2x.h diff --git a/drivers/net/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c similarity index 100% rename from drivers/net/bnx2x/bnx2x_cmn.c rename to drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c diff --git a/drivers/net/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h similarity index 100% rename from drivers/net/bnx2x/bnx2x_cmn.h rename to drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h diff --git a/drivers/net/bnx2x/bnx2x_dcb.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c similarity index 100% rename from drivers/net/bnx2x/bnx2x_dcb.c rename to drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c diff --git a/drivers/net/bnx2x/bnx2x_dcb.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h similarity index 100% rename from drivers/net/bnx2x/bnx2x_dcb.h rename to drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h diff --git a/drivers/net/bnx2x/bnx2x_dump.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dump.h similarity index 100% rename from drivers/net/bnx2x/bnx2x_dump.h rename to drivers/net/ethernet/broadcom/bnx2x/bnx2x_dump.h diff --git a/drivers/net/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c similarity index 100% rename from drivers/net/bnx2x/bnx2x_ethtool.c rename to drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c diff --git a/drivers/net/bnx2x/bnx2x_fw_defs.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h similarity index 100% rename from drivers/net/bnx2x/bnx2x_fw_defs.h rename to drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h diff --git a/drivers/net/bnx2x/bnx2x_fw_file_hdr.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_file_hdr.h similarity index 100% rename from drivers/net/bnx2x/bnx2x_fw_file_hdr.h rename to drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_file_hdr.h diff --git a/drivers/net/bnx2x/bnx2x_hsi.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h similarity index 100% rename from drivers/net/bnx2x/bnx2x_hsi.h rename to drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h diff --git a/drivers/net/bnx2x/bnx2x_init.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h similarity index 100% rename from drivers/net/bnx2x/bnx2x_init.h rename to drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h diff --git a/drivers/net/bnx2x/bnx2x_init_ops.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h similarity index 100% rename from drivers/net/bnx2x/bnx2x_init_ops.h rename to drivers/net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h diff --git a/drivers/net/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c similarity index 100% rename from drivers/net/bnx2x/bnx2x_link.c rename to drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c diff --git a/drivers/net/bnx2x/bnx2x_link.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h similarity index 100% rename from drivers/net/bnx2x/bnx2x_link.h rename to drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c similarity index 100% rename from drivers/net/bnx2x/bnx2x_main.c rename to drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c diff --git a/drivers/net/bnx2x/bnx2x_reg.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h similarity index 100% rename from drivers/net/bnx2x/bnx2x_reg.h rename to drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h diff --git a/drivers/net/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c similarity index 100% rename from drivers/net/bnx2x/bnx2x_sp.c rename to drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c diff --git a/drivers/net/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h similarity index 100% rename from drivers/net/bnx2x/bnx2x_sp.h rename to drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h diff --git a/drivers/net/bnx2x/bnx2x_stats.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c similarity index 100% rename from drivers/net/bnx2x/bnx2x_stats.c rename to drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c diff --git a/drivers/net/bnx2x/bnx2x_stats.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h similarity index 100% rename from drivers/net/bnx2x/bnx2x_stats.h rename to drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h diff --git a/drivers/net/cnic.c b/drivers/net/ethernet/broadcom/cnic.c similarity index 99% rename from drivers/net/cnic.c rename to drivers/net/ethernet/broadcom/cnic.c index 94a2e541006d..769816104a6d 100644 --- a/drivers/net/cnic.c +++ b/drivers/net/ethernet/broadcom/cnic.c @@ -45,8 +45,8 @@ #include "bnx2x/bnx2x_reg.h" #include "bnx2x/bnx2x_fw_defs.h" #include "bnx2x/bnx2x_hsi.h" -#include "../scsi/bnx2i/57xx_iscsi_constants.h" -#include "../scsi/bnx2i/57xx_iscsi_hsi.h" +#include "../../../scsi/bnx2i/57xx_iscsi_constants.h" +#include "../../../scsi/bnx2i/57xx_iscsi_hsi.h" #include "cnic.h" #include "cnic_defs.h" diff --git a/drivers/net/cnic.h b/drivers/net/ethernet/broadcom/cnic.h similarity index 100% rename from drivers/net/cnic.h rename to drivers/net/ethernet/broadcom/cnic.h diff --git a/drivers/net/cnic_defs.h b/drivers/net/ethernet/broadcom/cnic_defs.h similarity index 100% rename from drivers/net/cnic_defs.h rename to drivers/net/ethernet/broadcom/cnic_defs.h diff --git a/drivers/net/cnic_if.h b/drivers/net/ethernet/broadcom/cnic_if.h similarity index 100% rename from drivers/net/cnic_if.h rename to drivers/net/ethernet/broadcom/cnic_if.h diff --git a/drivers/net/sb1250-mac.c b/drivers/net/ethernet/broadcom/sb1250-mac.c similarity index 100% rename from drivers/net/sb1250-mac.c rename to drivers/net/ethernet/broadcom/sb1250-mac.c diff --git a/drivers/net/tg3.c b/drivers/net/ethernet/broadcom/tg3.c similarity index 100% rename from drivers/net/tg3.c rename to drivers/net/ethernet/broadcom/tg3.c diff --git a/drivers/net/tg3.h b/drivers/net/ethernet/broadcom/tg3.h similarity index 100% rename from drivers/net/tg3.h rename to drivers/net/ethernet/broadcom/tg3.h diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h index 42228ca5a9d2..5613e8afffb0 100644 --- a/drivers/scsi/bnx2fc/bnx2fc.h +++ b/drivers/scsi/bnx2fc/bnx2fc.h @@ -58,7 +58,7 @@ #include "57xx_hsi_bnx2fc.h" #include "bnx2fc_debug.h" -#include "../../net/cnic_if.h" +#include "../../net/ethernet/broadcom/cnic_if.h" #include "bnx2fc_constants.h" #define BNX2FC_NAME "bnx2fc" diff --git a/drivers/scsi/bnx2i/bnx2i.h b/drivers/scsi/bnx2i/bnx2i.h index dc5700765db4..0bd70e80efe4 100644 --- a/drivers/scsi/bnx2i/bnx2i.h +++ b/drivers/scsi/bnx2i/bnx2i.h @@ -40,7 +40,7 @@ #include #include -#include "../../net/cnic_if.h" +#include "../../net/ethernet/broadcom/cnic_if.h" #include "57xx_iscsi_hsi.h" #include "57xx_iscsi_constants.h" From f7917c009c28c941ba151ee66f04dc7f6a2e1e0b Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Thu, 7 Apr 2011 06:57:17 -0700 Subject: [PATCH 06/10] chelsio: Move the Chelsio drivers Moves the drivers for the Chelsio chipsets into drivers/net/ethernet/chelsio/ and the necessary Kconfig and Makefile changes. CC: Divy Le Ray CC: Dimitris Michailidis CC: Casey Leedom Signed-off-by: Jeff Kirsher --- MAINTAINERS | 6 +- drivers/infiniband/hw/cxgb3/Makefile | 2 +- drivers/infiniband/hw/cxgb4/Makefile | 2 +- drivers/net/Kconfig | 86 -------------- drivers/net/Makefile | 4 - drivers/net/ethernet/Kconfig | 1 + drivers/net/ethernet/Makefile | 1 + drivers/net/ethernet/chelsio/Kconfig | 106 ++++++++++++++++++ drivers/net/ethernet/chelsio/Makefile | 8 ++ .../chelsio/cxgb}/Makefile | 0 .../chelsio/cxgb}/common.h | 0 .../{chelsio => ethernet/chelsio/cxgb}/cphy.h | 0 .../chelsio/cxgb}/cpl5_cmd.h | 0 .../chelsio/cxgb}/cxgb2.c | 0 .../chelsio/cxgb}/elmer0.h | 0 .../{chelsio => ethernet/chelsio/cxgb}/espi.c | 0 .../{chelsio => ethernet/chelsio/cxgb}/espi.h | 0 .../chelsio/cxgb}/fpga_defs.h | 0 .../{chelsio => ethernet/chelsio/cxgb}/gmac.h | 0 .../chelsio/cxgb}/mv88e1xxx.c | 0 .../chelsio/cxgb}/mv88e1xxx.h | 0 .../chelsio/cxgb}/mv88x201x.c | 0 .../chelsio/cxgb}/my3126.c | 0 .../chelsio/cxgb}/pm3393.c | 0 .../{chelsio => ethernet/chelsio/cxgb}/regs.h | 0 .../{chelsio => ethernet/chelsio/cxgb}/sge.c | 0 .../{chelsio => ethernet/chelsio/cxgb}/sge.h | 0 .../{chelsio => ethernet/chelsio/cxgb}/subr.c | 0 .../chelsio/cxgb}/suni1x10gexp_regs.h | 0 .../{chelsio => ethernet/chelsio/cxgb}/tp.c | 0 .../{chelsio => ethernet/chelsio/cxgb}/tp.h | 0 .../chelsio/cxgb}/vsc7326.c | 0 .../chelsio/cxgb}/vsc7326_reg.h | 0 .../net/{ => ethernet/chelsio}/cxgb3/Makefile | 0 .../{ => ethernet/chelsio}/cxgb3/adapter.h | 0 .../{ => ethernet/chelsio}/cxgb3/ael1002.c | 0 .../net/{ => ethernet/chelsio}/cxgb3/aq100x.c | 0 .../net/{ => ethernet/chelsio}/cxgb3/common.h | 0 .../chelsio}/cxgb3/cxgb3_ctl_defs.h | 0 .../{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h | 0 .../chelsio}/cxgb3/cxgb3_ioctl.h | 0 .../{ => ethernet/chelsio}/cxgb3/cxgb3_main.c | 0 .../chelsio}/cxgb3/cxgb3_offload.c | 0 .../chelsio}/cxgb3/cxgb3_offload.h | 0 .../chelsio}/cxgb3/firmware_exports.h | 0 .../net/{ => ethernet/chelsio}/cxgb3/l2t.c | 0 .../net/{ => ethernet/chelsio}/cxgb3/l2t.h | 0 .../net/{ => ethernet/chelsio}/cxgb3/mc5.c | 0 .../net/{ => ethernet/chelsio}/cxgb3/regs.h | 0 .../net/{ => ethernet/chelsio}/cxgb3/sge.c | 0 .../{ => ethernet/chelsio}/cxgb3/sge_defs.h | 0 .../net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h | 0 .../net/{ => ethernet/chelsio}/cxgb3/t3_hw.c | 0 .../net/{ => ethernet/chelsio}/cxgb3/t3cdev.h | 0 .../{ => ethernet/chelsio}/cxgb3/version.h | 0 .../{ => ethernet/chelsio}/cxgb3/vsc8211.c | 0 .../net/{ => ethernet/chelsio}/cxgb3/xgmac.c | 0 .../net/{ => ethernet/chelsio}/cxgb4/Makefile | 0 .../net/{ => ethernet/chelsio}/cxgb4/cxgb4.h | 0 .../{ => ethernet/chelsio}/cxgb4/cxgb4_main.c | 0 .../{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h | 0 .../net/{ => ethernet/chelsio}/cxgb4/l2t.c | 0 .../net/{ => ethernet/chelsio}/cxgb4/l2t.h | 0 .../net/{ => ethernet/chelsio}/cxgb4/sge.c | 0 .../net/{ => ethernet/chelsio}/cxgb4/t4_hw.c | 0 .../net/{ => ethernet/chelsio}/cxgb4/t4_hw.h | 0 .../net/{ => ethernet/chelsio}/cxgb4/t4_msg.h | 0 .../{ => ethernet/chelsio}/cxgb4/t4_regs.h | 0 .../{ => ethernet/chelsio}/cxgb4/t4fw_api.h | 0 .../{ => ethernet/chelsio}/cxgb4vf/Makefile | 0 .../{ => ethernet/chelsio}/cxgb4vf/adapter.h | 0 .../chelsio}/cxgb4vf/cxgb4vf_main.c | 0 .../net/{ => ethernet/chelsio}/cxgb4vf/sge.c | 0 .../chelsio}/cxgb4vf/t4vf_common.h | 0 .../chelsio}/cxgb4vf/t4vf_defs.h | 0 .../{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c | 0 drivers/scsi/cxgbi/cxgb3i/Kbuild | 2 +- drivers/scsi/cxgbi/cxgb4i/Kbuild | 2 +- 78 files changed, 123 insertions(+), 97 deletions(-) create mode 100644 drivers/net/ethernet/chelsio/Kconfig create mode 100644 drivers/net/ethernet/chelsio/Makefile rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/Makefile (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/common.h (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cphy.h (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cpl5_cmd.h (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cxgb2.c (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/elmer0.h (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/espi.c (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/espi.h (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/fpga_defs.h (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/gmac.h (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.c (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.h (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88x201x.c (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/my3126.c (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/pm3393.c (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/regs.h (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/sge.c (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/sge.h (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/subr.c (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/suni1x10gexp_regs.h (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/tp.c (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/tp.h (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/vsc7326.c (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/vsc7326_reg.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/Makefile (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/adapter.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/ael1002.c (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/aq100x.c (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/common.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_ctl_defs.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_ioctl.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_main.c (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_offload.c (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_offload.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/firmware_exports.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.c (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/mc5.c (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/regs.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/sge.c (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/sge_defs.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3_hw.c (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3cdev.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/version.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/vsc8211.c (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/xgmac.c (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb4/Makefile (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4_main.c (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.c (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb4/sge.c (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.c (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_msg.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_regs.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4fw_api.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/Makefile (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/adapter.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/cxgb4vf_main.c (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/sge.c (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_common.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_defs.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index af9de64d89aa..0853d00c7d48 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1994,7 +1994,7 @@ M: Divy Le Ray L: netdev@vger.kernel.org W: http://www.chelsio.com S: Supported -F: drivers/net/cxgb3/ +F: drivers/net/ethernet/chelsio/cxgb3/ CXGB3 IWARP RNIC DRIVER (IW_CXGB3) M: Steve Wise @@ -2008,7 +2008,7 @@ M: Dimitris Michailidis L: netdev@vger.kernel.org W: http://www.chelsio.com S: Supported -F: drivers/net/cxgb4/ +F: drivers/net/ethernet/chelsio/cxgb4/ CXGB4 IWARP RNIC DRIVER (IW_CXGB4) M: Steve Wise @@ -2022,7 +2022,7 @@ M: Casey Leedom L: netdev@vger.kernel.org W: http://www.chelsio.com S: Supported -F: drivers/net/cxgb4vf/ +F: drivers/net/ethernet/chelsio/cxgb4vf/ STMMAC ETHERNET DRIVER M: Giuseppe Cavallaro diff --git a/drivers/infiniband/hw/cxgb3/Makefile b/drivers/infiniband/hw/cxgb3/Makefile index 621619c794e5..2761364185af 100644 --- a/drivers/infiniband/hw/cxgb3/Makefile +++ b/drivers/infiniband/hw/cxgb3/Makefile @@ -1,4 +1,4 @@ -ccflags-y := -Idrivers/net/cxgb3 +ccflags-y := -Idrivers/net/ethernet/chelsio/cxgb3 obj-$(CONFIG_INFINIBAND_CXGB3) += iw_cxgb3.o diff --git a/drivers/infiniband/hw/cxgb4/Makefile b/drivers/infiniband/hw/cxgb4/Makefile index cd20b1342aec..46b878ca2c3b 100644 --- a/drivers/infiniband/hw/cxgb4/Makefile +++ b/drivers/infiniband/hw/cxgb4/Makefile @@ -1,4 +1,4 @@ -ccflags-y := -Idrivers/net/cxgb4 +ccflags-y := -Idrivers/net/ethernet/chelsio/cxgb4 obj-$(CONFIG_INFINIBAND_CXGB4) += iw_cxgb4.o diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 2f9f208472de..77ab2e189475 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -1942,92 +1942,6 @@ if NETDEV_10000 config MDIO tristate -config CHELSIO_T1 - tristate "Chelsio 10Gb Ethernet support" - depends on PCI - select CRC32 - select MDIO - help - This driver supports Chelsio gigabit and 10-gigabit - Ethernet cards. More information about adapter features and - performance tuning is in . - - For general information about Chelsio and our products, visit - our website at . - - For customer support, please visit our customer support page at - . - - Please send feedback to . - - To compile this driver as a module, choose M here: the module - will be called cxgb. - -config CHELSIO_T1_1G - bool "Chelsio gigabit Ethernet support" - depends on CHELSIO_T1 - help - Enables support for Chelsio's gigabit Ethernet PCI cards. If you - are using only 10G cards say 'N' here. - -config CHELSIO_T3 - tristate "Chelsio Communications T3 10Gb Ethernet support" - depends on PCI && INET - select FW_LOADER - select MDIO - help - This driver supports Chelsio T3-based gigabit and 10Gb Ethernet - adapters. - - For general information about Chelsio and our products, visit - our website at . - - For customer support, please visit our customer support page at - . - - Please send feedback to . - - To compile this driver as a module, choose M here: the module - will be called cxgb3. - -config CHELSIO_T4 - tristate "Chelsio Communications T4 Ethernet support" - depends on PCI - select FW_LOADER - select MDIO - help - This driver supports Chelsio T4-based gigabit and 10Gb Ethernet - adapters. - - For general information about Chelsio and our products, visit - our website at . - - For customer support, please visit our customer support page at - . - - Please send feedback to . - - To compile this driver as a module choose M here; the module - will be called cxgb4. - -config CHELSIO_T4VF - tristate "Chelsio Communications T4 Virtual Function Ethernet support" - depends on PCI - help - This driver supports Chelsio T4-based gigabit and 10Gb Ethernet - adapters with PCI-E SR-IOV Virtual Functions. - - For general information about Chelsio and our products, visit - our website at . - - For customer support, please visit our customer support page at - . - - Please send feedback to . - - To compile this driver as a module choose M here; the module - will be called cxgb4vf. - config EHEA tristate "eHEA Ethernet support" depends on IBMEBUS && INET && SPARSEMEM diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 4cc2dcd3e0bd..a987d46bf67b 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -19,10 +19,6 @@ obj-$(CONFIG_IXGBE) += ixgbe/ obj-$(CONFIG_IXGBEVF) += ixgbevf/ obj-$(CONFIG_IXGB) += ixgb/ obj-$(CONFIG_IP1000) += ipg.o -obj-$(CONFIG_CHELSIO_T1) += chelsio/ -obj-$(CONFIG_CHELSIO_T3) += cxgb3/ -obj-$(CONFIG_CHELSIO_T4) += cxgb4/ -obj-$(CONFIG_CHELSIO_T4VF) += cxgb4vf/ obj-$(CONFIG_EHEA) += ehea/ obj-$(CONFIG_CAN) += can/ obj-$(CONFIG_BONDING) += bonding/ diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index 772fb49b4b3f..69d6403ec4bd 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -15,5 +15,6 @@ source "drivers/net/ethernet/3com/Kconfig" source "drivers/net/ethernet/8390/Kconfig" source "drivers/net/ethernet/amd/Kconfig" source "drivers/net/ethernet/broadcom/Kconfig" +source "drivers/net/ethernet/chelsio/Kconfig" endif # ETHERNET diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 3ef49a2bae06..470e5d843013 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -6,3 +6,4 @@ obj-$(CONFIG_NET_VENDOR_3COM) += 3com/ obj-$(CONFIG_NET_VENDOR_8390) += 8390/ obj-$(CONFIG_NET_VENDOR_AMD) += amd/ obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/ +obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/ diff --git a/drivers/net/ethernet/chelsio/Kconfig b/drivers/net/ethernet/chelsio/Kconfig new file mode 100644 index 000000000000..7b54574107ce --- /dev/null +++ b/drivers/net/ethernet/chelsio/Kconfig @@ -0,0 +1,106 @@ +# +# Chelsio device configuration +# + +config NET_VENDOR_CHELSIO + bool "Chelsio devices" + depends on PCI || INET + ---help--- + If you have a network (Ethernet) card belonging to this class, say Y + and read the Ethernet-HOWTO, available from + . + + 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 Chelsio devices. If you say Y, you will be asked for + your specific card in the following questions. + +if NET_VENDOR_CHELSIO + +config CHELSIO_T1 + tristate "Chelsio 10Gb Ethernet support" + depends on PCI + select CRC32 + select MDIO + ---help--- + This driver supports Chelsio gigabit and 10-gigabit + Ethernet cards. More information about adapter features and + performance tuning is in . + + For general information about Chelsio and our products, visit + our website at . + + For customer support, please visit our customer support page at + . + + Please send feedback to . + + To compile this driver as a module, choose M here: the module + will be called cxgb. + +config CHELSIO_T1_1G + bool "Chelsio gigabit Ethernet support" + depends on CHELSIO_T1 + ---help--- + Enables support for Chelsio's gigabit Ethernet PCI cards. If you + are using only 10G cards say 'N' here. + +config CHELSIO_T3 + tristate "Chelsio Communications T3 10Gb Ethernet support" + depends on PCI && INET + select FW_LOADER + select MDIO + ---help--- + This driver supports Chelsio T3-based gigabit and 10Gb Ethernet + adapters. + + For general information about Chelsio and our products, visit + our website at . + + For customer support, please visit our customer support page at + . + + Please send feedback to . + + To compile this driver as a module, choose M here: the module + will be called cxgb3. + +config CHELSIO_T4 + tristate "Chelsio Communications T4 Ethernet support" + depends on PCI + select FW_LOADER + select MDIO + ---help--- + This driver supports Chelsio T4-based gigabit and 10Gb Ethernet + adapters. + + For general information about Chelsio and our products, visit + our website at . + + For customer support, please visit our customer support page at + . + + Please send feedback to . + + To compile this driver as a module choose M here; the module + will be called cxgb4. + +config CHELSIO_T4VF + tristate "Chelsio Communications T4 Virtual Function Ethernet support" + depends on PCI + ---help--- + This driver supports Chelsio T4-based gigabit and 10Gb Ethernet + adapters with PCI-E SR-IOV Virtual Functions. + + For general information about Chelsio and our products, visit + our website at . + + For customer support, please visit our customer support page at + . + + Please send feedback to . + + To compile this driver as a module choose M here; the module + will be called cxgb4vf. + +endif # NET_VENDOR_CHELSIO diff --git a/drivers/net/ethernet/chelsio/Makefile b/drivers/net/ethernet/chelsio/Makefile new file mode 100644 index 000000000000..390510b5e90f --- /dev/null +++ b/drivers/net/ethernet/chelsio/Makefile @@ -0,0 +1,8 @@ +# +# Makefile for the Chelsio network device drivers. +# + +obj-$(CONFIG_CHELSIO_T1) += cxgb/ +obj-$(CONFIG_CHELSIO_T3) += cxgb3/ +obj-$(CONFIG_CHELSIO_T4) += cxgb4/ +obj-$(CONFIG_CHELSIO_T4VF) += cxgb4vf/ diff --git a/drivers/net/chelsio/Makefile b/drivers/net/ethernet/chelsio/cxgb/Makefile similarity index 100% rename from drivers/net/chelsio/Makefile rename to drivers/net/ethernet/chelsio/cxgb/Makefile diff --git a/drivers/net/chelsio/common.h b/drivers/net/ethernet/chelsio/cxgb/common.h similarity index 100% rename from drivers/net/chelsio/common.h rename to drivers/net/ethernet/chelsio/cxgb/common.h diff --git a/drivers/net/chelsio/cphy.h b/drivers/net/ethernet/chelsio/cxgb/cphy.h similarity index 100% rename from drivers/net/chelsio/cphy.h rename to drivers/net/ethernet/chelsio/cxgb/cphy.h diff --git a/drivers/net/chelsio/cpl5_cmd.h b/drivers/net/ethernet/chelsio/cxgb/cpl5_cmd.h similarity index 100% rename from drivers/net/chelsio/cpl5_cmd.h rename to drivers/net/ethernet/chelsio/cxgb/cpl5_cmd.h diff --git a/drivers/net/chelsio/cxgb2.c b/drivers/net/ethernet/chelsio/cxgb/cxgb2.c similarity index 100% rename from drivers/net/chelsio/cxgb2.c rename to drivers/net/ethernet/chelsio/cxgb/cxgb2.c diff --git a/drivers/net/chelsio/elmer0.h b/drivers/net/ethernet/chelsio/cxgb/elmer0.h similarity index 100% rename from drivers/net/chelsio/elmer0.h rename to drivers/net/ethernet/chelsio/cxgb/elmer0.h diff --git a/drivers/net/chelsio/espi.c b/drivers/net/ethernet/chelsio/cxgb/espi.c similarity index 100% rename from drivers/net/chelsio/espi.c rename to drivers/net/ethernet/chelsio/cxgb/espi.c diff --git a/drivers/net/chelsio/espi.h b/drivers/net/ethernet/chelsio/cxgb/espi.h similarity index 100% rename from drivers/net/chelsio/espi.h rename to drivers/net/ethernet/chelsio/cxgb/espi.h diff --git a/drivers/net/chelsio/fpga_defs.h b/drivers/net/ethernet/chelsio/cxgb/fpga_defs.h similarity index 100% rename from drivers/net/chelsio/fpga_defs.h rename to drivers/net/ethernet/chelsio/cxgb/fpga_defs.h diff --git a/drivers/net/chelsio/gmac.h b/drivers/net/ethernet/chelsio/cxgb/gmac.h similarity index 100% rename from drivers/net/chelsio/gmac.h rename to drivers/net/ethernet/chelsio/cxgb/gmac.h diff --git a/drivers/net/chelsio/mv88e1xxx.c b/drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.c similarity index 100% rename from drivers/net/chelsio/mv88e1xxx.c rename to drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.c diff --git a/drivers/net/chelsio/mv88e1xxx.h b/drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.h similarity index 100% rename from drivers/net/chelsio/mv88e1xxx.h rename to drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.h diff --git a/drivers/net/chelsio/mv88x201x.c b/drivers/net/ethernet/chelsio/cxgb/mv88x201x.c similarity index 100% rename from drivers/net/chelsio/mv88x201x.c rename to drivers/net/ethernet/chelsio/cxgb/mv88x201x.c diff --git a/drivers/net/chelsio/my3126.c b/drivers/net/ethernet/chelsio/cxgb/my3126.c similarity index 100% rename from drivers/net/chelsio/my3126.c rename to drivers/net/ethernet/chelsio/cxgb/my3126.c diff --git a/drivers/net/chelsio/pm3393.c b/drivers/net/ethernet/chelsio/cxgb/pm3393.c similarity index 100% rename from drivers/net/chelsio/pm3393.c rename to drivers/net/ethernet/chelsio/cxgb/pm3393.c diff --git a/drivers/net/chelsio/regs.h b/drivers/net/ethernet/chelsio/cxgb/regs.h similarity index 100% rename from drivers/net/chelsio/regs.h rename to drivers/net/ethernet/chelsio/cxgb/regs.h diff --git a/drivers/net/chelsio/sge.c b/drivers/net/ethernet/chelsio/cxgb/sge.c similarity index 100% rename from drivers/net/chelsio/sge.c rename to drivers/net/ethernet/chelsio/cxgb/sge.c diff --git a/drivers/net/chelsio/sge.h b/drivers/net/ethernet/chelsio/cxgb/sge.h similarity index 100% rename from drivers/net/chelsio/sge.h rename to drivers/net/ethernet/chelsio/cxgb/sge.h diff --git a/drivers/net/chelsio/subr.c b/drivers/net/ethernet/chelsio/cxgb/subr.c similarity index 100% rename from drivers/net/chelsio/subr.c rename to drivers/net/ethernet/chelsio/cxgb/subr.c diff --git a/drivers/net/chelsio/suni1x10gexp_regs.h b/drivers/net/ethernet/chelsio/cxgb/suni1x10gexp_regs.h similarity index 100% rename from drivers/net/chelsio/suni1x10gexp_regs.h rename to drivers/net/ethernet/chelsio/cxgb/suni1x10gexp_regs.h diff --git a/drivers/net/chelsio/tp.c b/drivers/net/ethernet/chelsio/cxgb/tp.c similarity index 100% rename from drivers/net/chelsio/tp.c rename to drivers/net/ethernet/chelsio/cxgb/tp.c diff --git a/drivers/net/chelsio/tp.h b/drivers/net/ethernet/chelsio/cxgb/tp.h similarity index 100% rename from drivers/net/chelsio/tp.h rename to drivers/net/ethernet/chelsio/cxgb/tp.h diff --git a/drivers/net/chelsio/vsc7326.c b/drivers/net/ethernet/chelsio/cxgb/vsc7326.c similarity index 100% rename from drivers/net/chelsio/vsc7326.c rename to drivers/net/ethernet/chelsio/cxgb/vsc7326.c diff --git a/drivers/net/chelsio/vsc7326_reg.h b/drivers/net/ethernet/chelsio/cxgb/vsc7326_reg.h similarity index 100% rename from drivers/net/chelsio/vsc7326_reg.h rename to drivers/net/ethernet/chelsio/cxgb/vsc7326_reg.h diff --git a/drivers/net/cxgb3/Makefile b/drivers/net/ethernet/chelsio/cxgb3/Makefile similarity index 100% rename from drivers/net/cxgb3/Makefile rename to drivers/net/ethernet/chelsio/cxgb3/Makefile diff --git a/drivers/net/cxgb3/adapter.h b/drivers/net/ethernet/chelsio/cxgb3/adapter.h similarity index 100% rename from drivers/net/cxgb3/adapter.h rename to drivers/net/ethernet/chelsio/cxgb3/adapter.h diff --git a/drivers/net/cxgb3/ael1002.c b/drivers/net/ethernet/chelsio/cxgb3/ael1002.c similarity index 100% rename from drivers/net/cxgb3/ael1002.c rename to drivers/net/ethernet/chelsio/cxgb3/ael1002.c diff --git a/drivers/net/cxgb3/aq100x.c b/drivers/net/ethernet/chelsio/cxgb3/aq100x.c similarity index 100% rename from drivers/net/cxgb3/aq100x.c rename to drivers/net/ethernet/chelsio/cxgb3/aq100x.c diff --git a/drivers/net/cxgb3/common.h b/drivers/net/ethernet/chelsio/cxgb3/common.h similarity index 100% rename from drivers/net/cxgb3/common.h rename to drivers/net/ethernet/chelsio/cxgb3/common.h diff --git a/drivers/net/cxgb3/cxgb3_ctl_defs.h b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_ctl_defs.h similarity index 100% rename from drivers/net/cxgb3/cxgb3_ctl_defs.h rename to drivers/net/ethernet/chelsio/cxgb3/cxgb3_ctl_defs.h diff --git a/drivers/net/cxgb3/cxgb3_defs.h b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_defs.h similarity index 100% rename from drivers/net/cxgb3/cxgb3_defs.h rename to drivers/net/ethernet/chelsio/cxgb3/cxgb3_defs.h diff --git a/drivers/net/cxgb3/cxgb3_ioctl.h b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_ioctl.h similarity index 100% rename from drivers/net/cxgb3/cxgb3_ioctl.h rename to drivers/net/ethernet/chelsio/cxgb3/cxgb3_ioctl.h diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c similarity index 100% rename from drivers/net/cxgb3/cxgb3_main.c rename to drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c diff --git a/drivers/net/cxgb3/cxgb3_offload.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c similarity index 100% rename from drivers/net/cxgb3/cxgb3_offload.c rename to drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c diff --git a/drivers/net/cxgb3/cxgb3_offload.h b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.h similarity index 100% rename from drivers/net/cxgb3/cxgb3_offload.h rename to drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.h diff --git a/drivers/net/cxgb3/firmware_exports.h b/drivers/net/ethernet/chelsio/cxgb3/firmware_exports.h similarity index 100% rename from drivers/net/cxgb3/firmware_exports.h rename to drivers/net/ethernet/chelsio/cxgb3/firmware_exports.h diff --git a/drivers/net/cxgb3/l2t.c b/drivers/net/ethernet/chelsio/cxgb3/l2t.c similarity index 100% rename from drivers/net/cxgb3/l2t.c rename to drivers/net/ethernet/chelsio/cxgb3/l2t.c diff --git a/drivers/net/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h similarity index 100% rename from drivers/net/cxgb3/l2t.h rename to drivers/net/ethernet/chelsio/cxgb3/l2t.h diff --git a/drivers/net/cxgb3/mc5.c b/drivers/net/ethernet/chelsio/cxgb3/mc5.c similarity index 100% rename from drivers/net/cxgb3/mc5.c rename to drivers/net/ethernet/chelsio/cxgb3/mc5.c diff --git a/drivers/net/cxgb3/regs.h b/drivers/net/ethernet/chelsio/cxgb3/regs.h similarity index 100% rename from drivers/net/cxgb3/regs.h rename to drivers/net/ethernet/chelsio/cxgb3/regs.h diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/ethernet/chelsio/cxgb3/sge.c similarity index 100% rename from drivers/net/cxgb3/sge.c rename to drivers/net/ethernet/chelsio/cxgb3/sge.c diff --git a/drivers/net/cxgb3/sge_defs.h b/drivers/net/ethernet/chelsio/cxgb3/sge_defs.h similarity index 100% rename from drivers/net/cxgb3/sge_defs.h rename to drivers/net/ethernet/chelsio/cxgb3/sge_defs.h diff --git a/drivers/net/cxgb3/t3_cpl.h b/drivers/net/ethernet/chelsio/cxgb3/t3_cpl.h similarity index 100% rename from drivers/net/cxgb3/t3_cpl.h rename to drivers/net/ethernet/chelsio/cxgb3/t3_cpl.h diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c similarity index 100% rename from drivers/net/cxgb3/t3_hw.c rename to drivers/net/ethernet/chelsio/cxgb3/t3_hw.c diff --git a/drivers/net/cxgb3/t3cdev.h b/drivers/net/ethernet/chelsio/cxgb3/t3cdev.h similarity index 100% rename from drivers/net/cxgb3/t3cdev.h rename to drivers/net/ethernet/chelsio/cxgb3/t3cdev.h diff --git a/drivers/net/cxgb3/version.h b/drivers/net/ethernet/chelsio/cxgb3/version.h similarity index 100% rename from drivers/net/cxgb3/version.h rename to drivers/net/ethernet/chelsio/cxgb3/version.h diff --git a/drivers/net/cxgb3/vsc8211.c b/drivers/net/ethernet/chelsio/cxgb3/vsc8211.c similarity index 100% rename from drivers/net/cxgb3/vsc8211.c rename to drivers/net/ethernet/chelsio/cxgb3/vsc8211.c diff --git a/drivers/net/cxgb3/xgmac.c b/drivers/net/ethernet/chelsio/cxgb3/xgmac.c similarity index 100% rename from drivers/net/cxgb3/xgmac.c rename to drivers/net/ethernet/chelsio/cxgb3/xgmac.c diff --git a/drivers/net/cxgb4/Makefile b/drivers/net/ethernet/chelsio/cxgb4/Makefile similarity index 100% rename from drivers/net/cxgb4/Makefile rename to drivers/net/ethernet/chelsio/cxgb4/Makefile diff --git a/drivers/net/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h similarity index 100% rename from drivers/net/cxgb4/cxgb4.h rename to drivers/net/ethernet/chelsio/cxgb4/cxgb4.h diff --git a/drivers/net/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c similarity index 100% rename from drivers/net/cxgb4/cxgb4_main.c rename to drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c diff --git a/drivers/net/cxgb4/cxgb4_uld.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h similarity index 100% rename from drivers/net/cxgb4/cxgb4_uld.h rename to drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h diff --git a/drivers/net/cxgb4/l2t.c b/drivers/net/ethernet/chelsio/cxgb4/l2t.c similarity index 100% rename from drivers/net/cxgb4/l2t.c rename to drivers/net/ethernet/chelsio/cxgb4/l2t.c diff --git a/drivers/net/cxgb4/l2t.h b/drivers/net/ethernet/chelsio/cxgb4/l2t.h similarity index 100% rename from drivers/net/cxgb4/l2t.h rename to drivers/net/ethernet/chelsio/cxgb4/l2t.h diff --git a/drivers/net/cxgb4/sge.c b/drivers/net/ethernet/chelsio/cxgb4/sge.c similarity index 100% rename from drivers/net/cxgb4/sge.c rename to drivers/net/ethernet/chelsio/cxgb4/sge.c diff --git a/drivers/net/cxgb4/t4_hw.c b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c similarity index 100% rename from drivers/net/cxgb4/t4_hw.c rename to drivers/net/ethernet/chelsio/cxgb4/t4_hw.c diff --git a/drivers/net/cxgb4/t4_hw.h b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.h similarity index 100% rename from drivers/net/cxgb4/t4_hw.h rename to drivers/net/ethernet/chelsio/cxgb4/t4_hw.h diff --git a/drivers/net/cxgb4/t4_msg.h b/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h similarity index 100% rename from drivers/net/cxgb4/t4_msg.h rename to drivers/net/ethernet/chelsio/cxgb4/t4_msg.h diff --git a/drivers/net/cxgb4/t4_regs.h b/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h similarity index 100% rename from drivers/net/cxgb4/t4_regs.h rename to drivers/net/ethernet/chelsio/cxgb4/t4_regs.h diff --git a/drivers/net/cxgb4/t4fw_api.h b/drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h similarity index 100% rename from drivers/net/cxgb4/t4fw_api.h rename to drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h diff --git a/drivers/net/cxgb4vf/Makefile b/drivers/net/ethernet/chelsio/cxgb4vf/Makefile similarity index 100% rename from drivers/net/cxgb4vf/Makefile rename to drivers/net/ethernet/chelsio/cxgb4vf/Makefile diff --git a/drivers/net/cxgb4vf/adapter.h b/drivers/net/ethernet/chelsio/cxgb4vf/adapter.h similarity index 100% rename from drivers/net/cxgb4vf/adapter.h rename to drivers/net/ethernet/chelsio/cxgb4vf/adapter.h diff --git a/drivers/net/cxgb4vf/cxgb4vf_main.c b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c similarity index 100% rename from drivers/net/cxgb4vf/cxgb4vf_main.c rename to drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c diff --git a/drivers/net/cxgb4vf/sge.c b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c similarity index 100% rename from drivers/net/cxgb4vf/sge.c rename to drivers/net/ethernet/chelsio/cxgb4vf/sge.c diff --git a/drivers/net/cxgb4vf/t4vf_common.h b/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h similarity index 100% rename from drivers/net/cxgb4vf/t4vf_common.h rename to drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h diff --git a/drivers/net/cxgb4vf/t4vf_defs.h b/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_defs.h similarity index 100% rename from drivers/net/cxgb4vf/t4vf_defs.h rename to drivers/net/ethernet/chelsio/cxgb4vf/t4vf_defs.h diff --git a/drivers/net/cxgb4vf/t4vf_hw.c b/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c similarity index 100% rename from drivers/net/cxgb4vf/t4vf_hw.c rename to drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c diff --git a/drivers/scsi/cxgbi/cxgb3i/Kbuild b/drivers/scsi/cxgbi/cxgb3i/Kbuild index 09dbf9efc8ea..6f095e28a974 100644 --- a/drivers/scsi/cxgbi/cxgb3i/Kbuild +++ b/drivers/scsi/cxgbi/cxgb3i/Kbuild @@ -1,3 +1,3 @@ -EXTRA_CFLAGS += -I$(srctree)/drivers/net/cxgb3 +EXTRA_CFLAGS += -I$(srctree)/drivers/net/ethernet/chelsio/cxgb3 obj-$(CONFIG_SCSI_CXGB3_ISCSI) += cxgb3i.o diff --git a/drivers/scsi/cxgbi/cxgb4i/Kbuild b/drivers/scsi/cxgbi/cxgb4i/Kbuild index b9f4af7454b7..8290cdaa4652 100644 --- a/drivers/scsi/cxgbi/cxgb4i/Kbuild +++ b/drivers/scsi/cxgbi/cxgb4i/Kbuild @@ -1,3 +1,3 @@ -EXTRA_CFLAGS += -I$(srctree)/drivers/net/cxgb4 +EXTRA_CFLAGS += -I$(srctree)/drivers/net/ethernet/chelsio/cxgb4 obj-$(CONFIG_SCSI_CXGB4_ISCSI) += cxgb4i.o From dee1ad47f2ee75f5146d83ca757c1b7861c34c3b Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Thu, 7 Apr 2011 07:42:33 -0700 Subject: [PATCH 07/10] intel: Move the Intel wired LAN drivers Moves the Intel wired LAN drivers into drivers/net/ethernet/intel/ and the necessary Kconfig and Makefile changes. Signed-off-by: Jeff Kirsher --- MAINTAINERS | 15 +- drivers/net/Kconfig | 200 ---------------- drivers/net/Makefile | 8 - drivers/net/ethernet/Kconfig | 1 + drivers/net/ethernet/Makefile | 1 + drivers/net/ethernet/intel/Kconfig | 220 ++++++++++++++++++ drivers/net/ethernet/intel/Makefile | 12 + drivers/net/{ => ethernet/intel}/e100.c | 0 .../net/{ => ethernet/intel}/e1000/Makefile | 0 .../net/{ => ethernet/intel}/e1000/e1000.h | 0 .../intel}/e1000/e1000_ethtool.c | 0 .../net/{ => ethernet/intel}/e1000/e1000_hw.c | 0 .../net/{ => ethernet/intel}/e1000/e1000_hw.h | 0 .../{ => ethernet/intel}/e1000/e1000_main.c | 0 .../{ => ethernet/intel}/e1000/e1000_osdep.h | 0 .../{ => ethernet/intel}/e1000/e1000_param.c | 0 .../intel/e1000e/80003es2lan.c} | 0 .../net/{ => ethernet/intel}/e1000e/82571.c | 0 .../net/{ => ethernet/intel}/e1000e/Makefile | 2 +- .../net/{ => ethernet/intel}/e1000e/defines.h | 0 .../net/{ => ethernet/intel}/e1000e/e1000.h | 0 .../net/{ => ethernet/intel}/e1000e/ethtool.c | 0 drivers/net/{ => ethernet/intel}/e1000e/hw.h | 0 .../net/{ => ethernet/intel}/e1000e/ich8lan.c | 0 drivers/net/{ => ethernet/intel}/e1000e/lib.c | 0 .../net/{ => ethernet/intel}/e1000e/netdev.c | 0 .../net/{ => ethernet/intel}/e1000e/param.c | 0 drivers/net/{ => ethernet/intel}/e1000e/phy.c | 0 drivers/net/{ => ethernet/intel}/igb/Makefile | 0 .../{ => ethernet/intel}/igb/e1000_82575.c | 0 .../{ => ethernet/intel}/igb/e1000_82575.h | 0 .../{ => ethernet/intel}/igb/e1000_defines.h | 0 .../net/{ => ethernet/intel}/igb/e1000_hw.h | 0 .../net/{ => ethernet/intel}/igb/e1000_mac.c | 0 .../net/{ => ethernet/intel}/igb/e1000_mac.h | 0 .../net/{ => ethernet/intel}/igb/e1000_mbx.c | 0 .../net/{ => ethernet/intel}/igb/e1000_mbx.h | 0 .../net/{ => ethernet/intel}/igb/e1000_nvm.c | 0 .../net/{ => ethernet/intel}/igb/e1000_nvm.h | 0 .../net/{ => ethernet/intel}/igb/e1000_phy.c | 0 .../net/{ => ethernet/intel}/igb/e1000_phy.h | 0 .../net/{ => ethernet/intel}/igb/e1000_regs.h | 0 drivers/net/{ => ethernet/intel}/igb/igb.h | 0 .../{ => ethernet/intel}/igb/igb_ethtool.c | 0 .../net/{ => ethernet/intel}/igb/igb_main.c | 0 .../net/{ => ethernet/intel}/igbvf/Makefile | 0 .../net/{ => ethernet/intel}/igbvf/defines.h | 0 .../net/{ => ethernet/intel}/igbvf/ethtool.c | 0 .../net/{ => ethernet/intel}/igbvf/igbvf.h | 0 drivers/net/{ => ethernet/intel}/igbvf/mbx.c | 0 drivers/net/{ => ethernet/intel}/igbvf/mbx.h | 0 .../net/{ => ethernet/intel}/igbvf/netdev.c | 0 drivers/net/{ => ethernet/intel}/igbvf/regs.h | 0 drivers/net/{ => ethernet/intel}/igbvf/vf.c | 0 drivers/net/{ => ethernet/intel}/igbvf/vf.h | 0 .../net/{ => ethernet/intel}/ixgb/Makefile | 0 drivers/net/{ => ethernet/intel}/ixgb/ixgb.h | 0 .../net/{ => ethernet/intel}/ixgb/ixgb_ee.c | 0 .../net/{ => ethernet/intel}/ixgb/ixgb_ee.h | 0 .../{ => ethernet/intel}/ixgb/ixgb_ethtool.c | 0 .../net/{ => ethernet/intel}/ixgb/ixgb_hw.c | 0 .../net/{ => ethernet/intel}/ixgb/ixgb_hw.h | 0 .../net/{ => ethernet/intel}/ixgb/ixgb_ids.h | 0 .../net/{ => ethernet/intel}/ixgb/ixgb_main.c | 0 .../{ => ethernet/intel}/ixgb/ixgb_osdep.h | 0 .../{ => ethernet/intel}/ixgb/ixgb_param.c | 0 .../net/{ => ethernet/intel}/ixgbe/Makefile | 0 .../net/{ => ethernet/intel}/ixgbe/ixgbe.h | 0 .../{ => ethernet/intel}/ixgbe/ixgbe_82598.c | 0 .../{ => ethernet/intel}/ixgbe/ixgbe_82599.c | 0 .../{ => ethernet/intel}/ixgbe/ixgbe_common.c | 0 .../{ => ethernet/intel}/ixgbe/ixgbe_common.h | 0 .../{ => ethernet/intel}/ixgbe/ixgbe_dcb.c | 0 .../{ => ethernet/intel}/ixgbe/ixgbe_dcb.h | 0 .../intel}/ixgbe/ixgbe_dcb_82598.c | 0 .../intel}/ixgbe/ixgbe_dcb_82598.h | 0 .../intel}/ixgbe/ixgbe_dcb_82599.c | 0 .../intel}/ixgbe/ixgbe_dcb_82599.h | 0 .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c | 0 .../intel}/ixgbe/ixgbe_ethtool.c | 0 .../{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c | 0 .../{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h | 0 .../{ => ethernet/intel}/ixgbe/ixgbe_main.c | 0 .../{ => ethernet/intel}/ixgbe/ixgbe_mbx.c | 0 .../{ => ethernet/intel}/ixgbe/ixgbe_mbx.h | 0 .../{ => ethernet/intel}/ixgbe/ixgbe_phy.c | 0 .../{ => ethernet/intel}/ixgbe/ixgbe_phy.h | 0 .../{ => ethernet/intel}/ixgbe/ixgbe_sriov.c | 0 .../{ => ethernet/intel}/ixgbe/ixgbe_sriov.h | 0 .../{ => ethernet/intel}/ixgbe/ixgbe_type.h | 0 .../{ => ethernet/intel}/ixgbe/ixgbe_x540.c | 0 .../net/{ => ethernet/intel}/ixgbevf/Makefile | 0 .../{ => ethernet/intel}/ixgbevf/defines.h | 0 .../{ => ethernet/intel}/ixgbevf/ethtool.c | 0 .../{ => ethernet/intel}/ixgbevf/ixgbevf.h | 0 .../intel}/ixgbevf/ixgbevf_main.c | 0 .../net/{ => ethernet/intel}/ixgbevf/mbx.c | 0 .../net/{ => ethernet/intel}/ixgbevf/mbx.h | 0 .../net/{ => ethernet/intel}/ixgbevf/regs.h | 0 drivers/net/{ => ethernet/intel}/ixgbevf/vf.c | 0 drivers/net/{ => ethernet/intel}/ixgbevf/vf.h | 0 101 files changed, 239 insertions(+), 220 deletions(-) create mode 100644 drivers/net/ethernet/intel/Kconfig create mode 100644 drivers/net/ethernet/intel/Makefile rename drivers/net/{ => ethernet/intel}/e100.c (100%) rename drivers/net/{ => ethernet/intel}/e1000/Makefile (100%) rename drivers/net/{ => ethernet/intel}/e1000/e1000.h (100%) rename drivers/net/{ => ethernet/intel}/e1000/e1000_ethtool.c (100%) rename drivers/net/{ => ethernet/intel}/e1000/e1000_hw.c (100%) rename drivers/net/{ => ethernet/intel}/e1000/e1000_hw.h (100%) rename drivers/net/{ => ethernet/intel}/e1000/e1000_main.c (100%) rename drivers/net/{ => ethernet/intel}/e1000/e1000_osdep.h (100%) rename drivers/net/{ => ethernet/intel}/e1000/e1000_param.c (100%) rename drivers/net/{e1000e/es2lan.c => ethernet/intel/e1000e/80003es2lan.c} (100%) rename drivers/net/{ => ethernet/intel}/e1000e/82571.c (100%) rename drivers/net/{ => ethernet/intel}/e1000e/Makefile (96%) rename drivers/net/{ => ethernet/intel}/e1000e/defines.h (100%) rename drivers/net/{ => ethernet/intel}/e1000e/e1000.h (100%) rename drivers/net/{ => ethernet/intel}/e1000e/ethtool.c (100%) rename drivers/net/{ => ethernet/intel}/e1000e/hw.h (100%) rename drivers/net/{ => ethernet/intel}/e1000e/ich8lan.c (100%) rename drivers/net/{ => ethernet/intel}/e1000e/lib.c (100%) rename drivers/net/{ => ethernet/intel}/e1000e/netdev.c (100%) rename drivers/net/{ => ethernet/intel}/e1000e/param.c (100%) rename drivers/net/{ => ethernet/intel}/e1000e/phy.c (100%) rename drivers/net/{ => ethernet/intel}/igb/Makefile (100%) rename drivers/net/{ => ethernet/intel}/igb/e1000_82575.c (100%) rename drivers/net/{ => ethernet/intel}/igb/e1000_82575.h (100%) rename drivers/net/{ => ethernet/intel}/igb/e1000_defines.h (100%) rename drivers/net/{ => ethernet/intel}/igb/e1000_hw.h (100%) rename drivers/net/{ => ethernet/intel}/igb/e1000_mac.c (100%) rename drivers/net/{ => ethernet/intel}/igb/e1000_mac.h (100%) rename drivers/net/{ => ethernet/intel}/igb/e1000_mbx.c (100%) rename drivers/net/{ => ethernet/intel}/igb/e1000_mbx.h (100%) rename drivers/net/{ => ethernet/intel}/igb/e1000_nvm.c (100%) rename drivers/net/{ => ethernet/intel}/igb/e1000_nvm.h (100%) rename drivers/net/{ => ethernet/intel}/igb/e1000_phy.c (100%) rename drivers/net/{ => ethernet/intel}/igb/e1000_phy.h (100%) rename drivers/net/{ => ethernet/intel}/igb/e1000_regs.h (100%) rename drivers/net/{ => ethernet/intel}/igb/igb.h (100%) rename drivers/net/{ => ethernet/intel}/igb/igb_ethtool.c (100%) rename drivers/net/{ => ethernet/intel}/igb/igb_main.c (100%) rename drivers/net/{ => ethernet/intel}/igbvf/Makefile (100%) rename drivers/net/{ => ethernet/intel}/igbvf/defines.h (100%) rename drivers/net/{ => ethernet/intel}/igbvf/ethtool.c (100%) rename drivers/net/{ => ethernet/intel}/igbvf/igbvf.h (100%) rename drivers/net/{ => ethernet/intel}/igbvf/mbx.c (100%) rename drivers/net/{ => ethernet/intel}/igbvf/mbx.h (100%) rename drivers/net/{ => ethernet/intel}/igbvf/netdev.c (100%) rename drivers/net/{ => ethernet/intel}/igbvf/regs.h (100%) rename drivers/net/{ => ethernet/intel}/igbvf/vf.c (100%) rename drivers/net/{ => ethernet/intel}/igbvf/vf.h (100%) rename drivers/net/{ => ethernet/intel}/ixgb/Makefile (100%) rename drivers/net/{ => ethernet/intel}/ixgb/ixgb.h (100%) rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.c (100%) rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.h (100%) rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ethtool.c (100%) rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.c (100%) rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.h (100%) rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ids.h (100%) rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_main.c (100%) rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_osdep.h (100%) rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_param.c (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/Makefile (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe.h (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_82598.c (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_82599.c (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_common.c (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_common.h (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.c (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.h (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.c (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.h (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.c (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.h (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_ethtool.c (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_main.c (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.c (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.h (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.c (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.h (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.c (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.h (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_type.h (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_x540.c (100%) rename drivers/net/{ => ethernet/intel}/ixgbevf/Makefile (100%) rename drivers/net/{ => ethernet/intel}/ixgbevf/defines.h (100%) rename drivers/net/{ => ethernet/intel}/ixgbevf/ethtool.c (100%) rename drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf.h (100%) rename drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf_main.c (100%) rename drivers/net/{ => ethernet/intel}/ixgbevf/mbx.c (100%) rename drivers/net/{ => ethernet/intel}/ixgbevf/mbx.h (100%) rename drivers/net/{ => ethernet/intel}/ixgbevf/regs.h (100%) rename drivers/net/{ => ethernet/intel}/ixgbevf/vf.c (100%) rename drivers/net/{ => ethernet/intel}/ixgbevf/vf.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 0853d00c7d48..f4838da520c3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3340,13 +3340,13 @@ M: Bruce Allan M: Carolyn Wyborny M: Don Skidmore M: Greg Rose -M: PJ Waskiewicz +M: Peter P Waskiewicz Jr M: Alex Duyck M: John Ronciak L: e1000-devel@lists.sourceforge.net W: http://e1000.sourceforge.net/ -T: git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-2.6.git -T: git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next-2.6.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next.git S: Supported F: Documentation/networking/e100.txt F: Documentation/networking/e1000.txt @@ -3356,14 +3356,7 @@ F: Documentation/networking/igbvf.txt F: Documentation/networking/ixgb.txt F: Documentation/networking/ixgbe.txt F: Documentation/networking/ixgbevf.txt -F: drivers/net/e100.c -F: drivers/net/e1000/ -F: drivers/net/e1000e/ -F: drivers/net/igb/ -F: drivers/net/igbvf/ -F: drivers/net/ixgb/ -F: drivers/net/ixgbe/ -F: drivers/net/ixgbevf/ +F: drivers/net/ethernet/intel/ INTEL MRST PMU DRIVER M: Len Brown diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 77ab2e189475..e6491169cc6f 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -1032,32 +1032,6 @@ config TC35815 depends on NET_PCI && PCI && MIPS select PHYLIB -config E100 - tristate "Intel(R) PRO/100+ support" - depends on NET_PCI && PCI - select MII - ---help--- - This driver supports Intel(R) PRO/100 family of adapters. - To verify that your adapter is supported, find the board ID number - on the adapter. Look for a label that has a barcode and a number - in the format 123456-001 (six digits hyphen three digits). - - Use the above information and the Adapter & Driver ID Guide at: - - - - to identify the adapter. - - For the latest Intel PRO/100 network driver for Linux, see: - - - - More specific information on configuring the driver is in - . - - To compile this driver as a module, choose M here. The module - will be called e100. - config FEALNX tristate "Myson MTD-8xx PCI Ethernet support" depends on NET_PCI && PCI @@ -1490,47 +1464,6 @@ config DL2K To compile this driver as a module, choose M here: the module will be called dl2k. -config E1000 - tristate "Intel(R) PRO/1000 Gigabit Ethernet support" - depends on PCI - ---help--- - This driver supports Intel(R) PRO/1000 gigabit ethernet family of - adapters. For more information on how to identify your adapter, go - to the Adapter & Driver ID Guide at: - - - - For general information and support, go to the Intel support - website at: - - - - More specific information on configuring the driver is in - . - - To compile this driver as a module, choose M here. The module - will be called e1000. - -config E1000E - tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support" - depends on PCI && (!SPARC32 || BROKEN) - select CRC32 - ---help--- - This driver supports the PCI-Express Intel(R) PRO/1000 gigabit - ethernet family of adapters. For PCI or PCI-X e1000 adapters, - use the regular e1000 driver For more information on how to - identify your adapter, go to the Adapter & Driver ID Guide at: - - - - For general information and support, go to the Intel support - website at: - - - - To compile this driver as a module, choose M here. The module - will be called e1000e. - config IP1000 tristate "IP1000 Gigabit Ethernet support" depends on PCI && EXPERIMENTAL @@ -1541,57 +1474,6 @@ config IP1000 To compile this driver as a module, choose M here: the module will be called ipg. This is recommended. -config IGB - tristate "Intel(R) 82575/82576 PCI-Express Gigabit Ethernet support" - depends on PCI - ---help--- - This driver supports Intel(R) 82575/82576 gigabit ethernet family of - adapters. For more information on how to identify your adapter, go - to the Adapter & Driver ID Guide at: - - - - For general information and support, go to the Intel support - website at: - - - - More specific information on configuring the driver is in - . - - To compile this driver as a module, choose M here. The module - will be called igb. - -config IGB_DCA - bool "Direct Cache Access (DCA) Support" - default y - depends on IGB && DCA && !(IGB=y && DCA=m) - ---help--- - Say Y here if you want to use Direct Cache Access (DCA) in the - driver. DCA is a method for warming the CPU cache before data - is used, with the intent of lessening the impact of cache misses. - -config IGBVF - tristate "Intel(R) 82576 Virtual Function Ethernet support" - depends on PCI - ---help--- - This driver supports Intel(R) 82576 virtual functions. For more - information on how to identify your adapter, go to the Adapter & - Driver ID Guide at: - - - - For general information and support, go to the Intel support - website at: - - - - More specific information on configuring the driver is in - . - - To compile this driver as a module, choose M here. The module - will be called igbvf. - source "drivers/net/ixp2000/Kconfig" config NS83820 @@ -1958,88 +1840,6 @@ config ENIC help This enables the support for the Cisco VIC Ethernet card. -config IXGBE - tristate "Intel(R) 10GbE PCI Express adapters support" - depends on PCI && INET - select MDIO - ---help--- - This driver supports Intel(R) 10GbE PCI Express family of - adapters. For more information on how to identify your adapter, go - to the Adapter & Driver ID Guide at: - - - - For general information and support, go to the Intel support - website at: - - - - To compile this driver as a module, choose M here. The module - will be called ixgbe. - -config IXGBE_DCA - bool "Direct Cache Access (DCA) Support" - default y - depends on IXGBE && DCA && !(IXGBE=y && DCA=m) - ---help--- - Say Y here if you want to use Direct Cache Access (DCA) in the - driver. DCA is a method for warming the CPU cache before data - is used, with the intent of lessening the impact of cache misses. - -config IXGBE_DCB - bool "Data Center Bridging (DCB) Support" - default n - depends on IXGBE && DCB - ---help--- - Say Y here if you want to use Data Center Bridging (DCB) in the - driver. - - If unsure, say N. - -config IXGBEVF - tristate "Intel(R) 82599 Virtual Function Ethernet support" - depends on PCI_MSI - ---help--- - This driver supports Intel(R) 82599 virtual functions. For more - information on how to identify your adapter, go to the Adapter & - Driver ID Guide at: - - - - For general information and support, go to the Intel support - website at: - - - - More specific information on configuring the driver is in - . - - To compile this driver as a module, choose M here. The module - will be called ixgbevf. MSI-X interrupt support is required - for this driver to work correctly. - -config IXGB - tristate "Intel(R) PRO/10GbE support" - depends on PCI - ---help--- - This driver supports Intel(R) PRO/10GbE family of adapters for - PCI-X type cards. For PCI-E type cards, use the "ixgbe" driver - instead. For more information on how to identify your adapter, go - to the Adapter & Driver ID Guide at: - - - - For general information and support, go to the Intel support - website at: - - - - More specific information on configuring the driver is in - . - - To compile this driver as a module, choose M here. The module - will be called ixgb. - config S2IO tristate "Exar Xframe 10Gb Ethernet Adapter" depends on PCI diff --git a/drivers/net/Makefile b/drivers/net/Makefile index a987d46bf67b..84b986004385 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -10,14 +10,7 @@ obj-$(CONFIG_TI_DAVINCI_EMAC) += davinci_emac.o obj-$(CONFIG_TI_DAVINCI_MDIO) += davinci_mdio.o obj-$(CONFIG_TI_DAVINCI_CPDMA) += davinci_cpdma.o -obj-$(CONFIG_E1000) += e1000/ -obj-$(CONFIG_E1000E) += e1000e/ obj-$(CONFIG_IBM_NEW_EMAC) += ibm_newemac/ -obj-$(CONFIG_IGB) += igb/ -obj-$(CONFIG_IGBVF) += igbvf/ -obj-$(CONFIG_IXGBE) += ixgbe/ -obj-$(CONFIG_IXGBEVF) += ixgbevf/ -obj-$(CONFIG_IXGB) += ixgb/ obj-$(CONFIG_IP1000) += ipg.o obj-$(CONFIG_EHEA) += ehea/ obj-$(CONFIG_CAN) += can/ @@ -61,7 +54,6 @@ obj-$(CONFIG_SUNVNET) += sunvnet.o obj-$(CONFIG_MACE) += mace.o obj-$(CONFIG_BMAC) += bmac.o -obj-$(CONFIG_E100) += e100.o obj-$(CONFIG_TLAN) += tlan.o obj-$(CONFIG_EPIC100) += epic100.o obj-$(CONFIG_SMSC9420) += smsc9420.o diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index 69d6403ec4bd..a2fd38562cb3 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -16,5 +16,6 @@ source "drivers/net/ethernet/8390/Kconfig" source "drivers/net/ethernet/amd/Kconfig" source "drivers/net/ethernet/broadcom/Kconfig" source "drivers/net/ethernet/chelsio/Kconfig" +source "drivers/net/ethernet/intel/Kconfig" endif # ETHERNET diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 470e5d843013..526527177d13 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -7,3 +7,4 @@ obj-$(CONFIG_NET_VENDOR_8390) += 8390/ obj-$(CONFIG_NET_VENDOR_AMD) += amd/ obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/ obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/ +obj-$(CONFIG_NET_VENDOR_INTEL) += intel/ diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig new file mode 100644 index 000000000000..5fe185ba07bc --- /dev/null +++ b/drivers/net/ethernet/intel/Kconfig @@ -0,0 +1,220 @@ +# +# Intel network device configuration +# + +config NET_VENDOR_INTEL + bool "Intel devices" + depends on PCI || PCI_MSI + ---help--- + If you have a network (Ethernet) card belonging to this class, say Y + and read the Ethernet-HOWTO, available from + . + + 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 Intel cards. If you say Y, you will be asked for + your specific card in the following questions. + +if NET_VENDOR_INTEL + +config E100 + tristate "Intel(R) PRO/100+ support" + depends on PCI + select MII + ---help--- + This driver supports Intel(R) PRO/100 family of adapters. + To verify that your adapter is supported, find the board ID number + on the adapter. Look for a label that has a barcode and a number + in the format 123456-001 (six digits hyphen three digits). + + Use the above information and the Adapter & Driver ID Guide at: + + + + to identify the adapter. + + For the latest Intel PRO/100 network driver for Linux, see: + + + + More specific information on configuring the driver is in + . + + To compile this driver as a module, choose M here. The module + will be called e100. + +config E1000 + tristate "Intel(R) PRO/1000 Gigabit Ethernet support" + depends on PCI + ---help--- + This driver supports Intel(R) PRO/1000 gigabit ethernet family of + adapters. For more information on how to identify your adapter, go + to the Adapter & Driver ID Guide at: + + + + For general information and support, go to the Intel support + website at: + + + + More specific information on configuring the driver is in + . + + To compile this driver as a module, choose M here. The module + will be called e1000. + +config E1000E + tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support" + depends on PCI && (!SPARC32 || BROKEN) + select CRC32 + ---help--- + This driver supports the PCI-Express Intel(R) PRO/1000 gigabit + ethernet family of adapters. For PCI or PCI-X e1000 adapters, + use the regular e1000 driver For more information on how to + identify your adapter, go to the Adapter & Driver ID Guide at: + + + + For general information and support, go to the Intel support + website at: + + + + To compile this driver as a module, choose M here. The module + will be called e1000e. + +config IGB + tristate "Intel(R) 82575/82576 PCI-Express Gigabit Ethernet support" + depends on PCI + ---help--- + This driver supports Intel(R) 82575/82576 gigabit ethernet family of + adapters. For more information on how to identify your adapter, go + to the Adapter & Driver ID Guide at: + + + + For general information and support, go to the Intel support + website at: + + + + More specific information on configuring the driver is in + . + + To compile this driver as a module, choose M here. The module + will be called igb. + +config IGB_DCA + bool "Direct Cache Access (DCA) Support" + default y + depends on IGB && DCA && !(IGB=y && DCA=m) + ---help--- + Say Y here if you want to use Direct Cache Access (DCA) in the + driver. DCA is a method for warming the CPU cache before data + is used, with the intent of lessening the impact of cache misses. + +config IGBVF + tristate "Intel(R) 82576 Virtual Function Ethernet support" + depends on PCI + ---help--- + This driver supports Intel(R) 82576 virtual functions. For more + information on how to identify your adapter, go to the Adapter & + Driver ID Guide at: + + + + For general information and support, go to the Intel support + website at: + + + + More specific information on configuring the driver is in + . + + To compile this driver as a module, choose M here. The module + will be called igbvf. + +config IXGB + tristate "Intel(R) PRO/10GbE support" + depends on PCI + ---help--- + This driver supports Intel(R) PRO/10GbE family of adapters for + PCI-X type cards. For PCI-E type cards, use the "ixgbe" driver + instead. For more information on how to identify your adapter, go + to the Adapter & Driver ID Guide at: + + + + For general information and support, go to the Intel support + website at: + + + + More specific information on configuring the driver is in + . + + To compile this driver as a module, choose M here. The module + will be called ixgb. + +config IXGBE + tristate "Intel(R) 10GbE PCI Express adapters support" + depends on PCI && INET + select MDIO + ---help--- + This driver supports Intel(R) 10GbE PCI Express family of + adapters. For more information on how to identify your adapter, go + to the Adapter & Driver ID Guide at: + + + + For general information and support, go to the Intel support + website at: + + + + To compile this driver as a module, choose M here. The module + will be called ixgbe. + +config IXGBE_DCA + bool "Direct Cache Access (DCA) Support" + default y + depends on IXGBE && DCA && !(IXGBE=y && DCA=m) + ---help--- + Say Y here if you want to use Direct Cache Access (DCA) in the + driver. DCA is a method for warming the CPU cache before data + is used, with the intent of lessening the impact of cache misses. + +config IXGBE_DCB + bool "Data Center Bridging (DCB) Support" + default n + depends on IXGBE && DCB + ---help--- + Say Y here if you want to use Data Center Bridging (DCB) in the + driver. + + If unsure, say N. + +config IXGBEVF + tristate "Intel(R) 82599 Virtual Function Ethernet support" + depends on PCI_MSI + ---help--- + This driver supports Intel(R) 82599 virtual functions. For more + information on how to identify your adapter, go to the Adapter & + Driver ID Guide at: + + + + For general information and support, go to the Intel support + website at: + + + + More specific information on configuring the driver is in + . + + To compile this driver as a module, choose M here. The module + will be called ixgbevf. MSI-X interrupt support is required + for this driver to work correctly. + +endif # NET_VENDOR_INTEL diff --git a/drivers/net/ethernet/intel/Makefile b/drivers/net/ethernet/intel/Makefile new file mode 100644 index 000000000000..c8210e688669 --- /dev/null +++ b/drivers/net/ethernet/intel/Makefile @@ -0,0 +1,12 @@ +# +# Makefile for the Intel network device drivers. +# + +obj-$(CONFIG_E100) += e100.o +obj-$(CONFIG_E1000) += e1000/ +obj-$(CONFIG_E1000E) += e1000e/ +obj-$(CONFIG_IGB) += igb/ +obj-$(CONFIG_IGBVF) += igbvf/ +obj-$(CONFIG_IXGBE) += ixgbe/ +obj-$(CONFIG_IXGBEVF) += ixgbevf/ +obj-$(CONFIG_IXGB) += ixgb/ diff --git a/drivers/net/e100.c b/drivers/net/ethernet/intel/e100.c similarity index 100% rename from drivers/net/e100.c rename to drivers/net/ethernet/intel/e100.c diff --git a/drivers/net/e1000/Makefile b/drivers/net/ethernet/intel/e1000/Makefile similarity index 100% rename from drivers/net/e1000/Makefile rename to drivers/net/ethernet/intel/e1000/Makefile diff --git a/drivers/net/e1000/e1000.h b/drivers/net/ethernet/intel/e1000/e1000.h similarity index 100% rename from drivers/net/e1000/e1000.h rename to drivers/net/ethernet/intel/e1000/e1000.h diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c similarity index 100% rename from drivers/net/e1000/e1000_ethtool.c rename to drivers/net/ethernet/intel/e1000/e1000_ethtool.c diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/ethernet/intel/e1000/e1000_hw.c similarity index 100% rename from drivers/net/e1000/e1000_hw.c rename to drivers/net/ethernet/intel/e1000/e1000_hw.c diff --git a/drivers/net/e1000/e1000_hw.h b/drivers/net/ethernet/intel/e1000/e1000_hw.h similarity index 100% rename from drivers/net/e1000/e1000_hw.h rename to drivers/net/ethernet/intel/e1000/e1000_hw.h diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c similarity index 100% rename from drivers/net/e1000/e1000_main.c rename to drivers/net/ethernet/intel/e1000/e1000_main.c diff --git a/drivers/net/e1000/e1000_osdep.h b/drivers/net/ethernet/intel/e1000/e1000_osdep.h similarity index 100% rename from drivers/net/e1000/e1000_osdep.h rename to drivers/net/ethernet/intel/e1000/e1000_osdep.h diff --git a/drivers/net/e1000/e1000_param.c b/drivers/net/ethernet/intel/e1000/e1000_param.c similarity index 100% rename from drivers/net/e1000/e1000_param.c rename to drivers/net/ethernet/intel/e1000/e1000_param.c diff --git a/drivers/net/e1000e/es2lan.c b/drivers/net/ethernet/intel/e1000e/80003es2lan.c similarity index 100% rename from drivers/net/e1000e/es2lan.c rename to drivers/net/ethernet/intel/e1000e/80003es2lan.c diff --git a/drivers/net/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c similarity index 100% rename from drivers/net/e1000e/82571.c rename to drivers/net/ethernet/intel/e1000e/82571.c diff --git a/drivers/net/e1000e/Makefile b/drivers/net/ethernet/intel/e1000e/Makefile similarity index 96% rename from drivers/net/e1000e/Makefile rename to drivers/net/ethernet/intel/e1000e/Makefile index 28519acacd2d..948c05db5d68 100644 --- a/drivers/net/e1000e/Makefile +++ b/drivers/net/ethernet/intel/e1000e/Makefile @@ -32,6 +32,6 @@ obj-$(CONFIG_E1000E) += e1000e.o -e1000e-objs := 82571.o ich8lan.o es2lan.o \ +e1000e-objs := 82571.o ich8lan.o 80003es2lan.o \ lib.o phy.o param.o ethtool.o netdev.o diff --git a/drivers/net/e1000e/defines.h b/drivers/net/ethernet/intel/e1000e/defines.h similarity index 100% rename from drivers/net/e1000e/defines.h rename to drivers/net/ethernet/intel/e1000e/defines.h diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h similarity index 100% rename from drivers/net/e1000e/e1000.h rename to drivers/net/ethernet/intel/e1000e/e1000.h diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c similarity index 100% rename from drivers/net/e1000e/ethtool.c rename to drivers/net/ethernet/intel/e1000e/ethtool.c diff --git a/drivers/net/e1000e/hw.h b/drivers/net/ethernet/intel/e1000e/hw.h similarity index 100% rename from drivers/net/e1000e/hw.h rename to drivers/net/ethernet/intel/e1000e/hw.h diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c similarity index 100% rename from drivers/net/e1000e/ich8lan.c rename to drivers/net/ethernet/intel/e1000e/ich8lan.c diff --git a/drivers/net/e1000e/lib.c b/drivers/net/ethernet/intel/e1000e/lib.c similarity index 100% rename from drivers/net/e1000e/lib.c rename to drivers/net/ethernet/intel/e1000e/lib.c diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c similarity index 100% rename from drivers/net/e1000e/netdev.c rename to drivers/net/ethernet/intel/e1000e/netdev.c diff --git a/drivers/net/e1000e/param.c b/drivers/net/ethernet/intel/e1000e/param.c similarity index 100% rename from drivers/net/e1000e/param.c rename to drivers/net/ethernet/intel/e1000e/param.c diff --git a/drivers/net/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c similarity index 100% rename from drivers/net/e1000e/phy.c rename to drivers/net/ethernet/intel/e1000e/phy.c diff --git a/drivers/net/igb/Makefile b/drivers/net/ethernet/intel/igb/Makefile similarity index 100% rename from drivers/net/igb/Makefile rename to drivers/net/ethernet/intel/igb/Makefile diff --git a/drivers/net/igb/e1000_82575.c b/drivers/net/ethernet/intel/igb/e1000_82575.c similarity index 100% rename from drivers/net/igb/e1000_82575.c rename to drivers/net/ethernet/intel/igb/e1000_82575.c diff --git a/drivers/net/igb/e1000_82575.h b/drivers/net/ethernet/intel/igb/e1000_82575.h similarity index 100% rename from drivers/net/igb/e1000_82575.h rename to drivers/net/ethernet/intel/igb/e1000_82575.h diff --git a/drivers/net/igb/e1000_defines.h b/drivers/net/ethernet/intel/igb/e1000_defines.h similarity index 100% rename from drivers/net/igb/e1000_defines.h rename to drivers/net/ethernet/intel/igb/e1000_defines.h diff --git a/drivers/net/igb/e1000_hw.h b/drivers/net/ethernet/intel/igb/e1000_hw.h similarity index 100% rename from drivers/net/igb/e1000_hw.h rename to drivers/net/ethernet/intel/igb/e1000_hw.h diff --git a/drivers/net/igb/e1000_mac.c b/drivers/net/ethernet/intel/igb/e1000_mac.c similarity index 100% rename from drivers/net/igb/e1000_mac.c rename to drivers/net/ethernet/intel/igb/e1000_mac.c diff --git a/drivers/net/igb/e1000_mac.h b/drivers/net/ethernet/intel/igb/e1000_mac.h similarity index 100% rename from drivers/net/igb/e1000_mac.h rename to drivers/net/ethernet/intel/igb/e1000_mac.h diff --git a/drivers/net/igb/e1000_mbx.c b/drivers/net/ethernet/intel/igb/e1000_mbx.c similarity index 100% rename from drivers/net/igb/e1000_mbx.c rename to drivers/net/ethernet/intel/igb/e1000_mbx.c diff --git a/drivers/net/igb/e1000_mbx.h b/drivers/net/ethernet/intel/igb/e1000_mbx.h similarity index 100% rename from drivers/net/igb/e1000_mbx.h rename to drivers/net/ethernet/intel/igb/e1000_mbx.h diff --git a/drivers/net/igb/e1000_nvm.c b/drivers/net/ethernet/intel/igb/e1000_nvm.c similarity index 100% rename from drivers/net/igb/e1000_nvm.c rename to drivers/net/ethernet/intel/igb/e1000_nvm.c diff --git a/drivers/net/igb/e1000_nvm.h b/drivers/net/ethernet/intel/igb/e1000_nvm.h similarity index 100% rename from drivers/net/igb/e1000_nvm.h rename to drivers/net/ethernet/intel/igb/e1000_nvm.h diff --git a/drivers/net/igb/e1000_phy.c b/drivers/net/ethernet/intel/igb/e1000_phy.c similarity index 100% rename from drivers/net/igb/e1000_phy.c rename to drivers/net/ethernet/intel/igb/e1000_phy.c diff --git a/drivers/net/igb/e1000_phy.h b/drivers/net/ethernet/intel/igb/e1000_phy.h similarity index 100% rename from drivers/net/igb/e1000_phy.h rename to drivers/net/ethernet/intel/igb/e1000_phy.h diff --git a/drivers/net/igb/e1000_regs.h b/drivers/net/ethernet/intel/igb/e1000_regs.h similarity index 100% rename from drivers/net/igb/e1000_regs.h rename to drivers/net/ethernet/intel/igb/e1000_regs.h diff --git a/drivers/net/igb/igb.h b/drivers/net/ethernet/intel/igb/igb.h similarity index 100% rename from drivers/net/igb/igb.h rename to drivers/net/ethernet/intel/igb/igb.h diff --git a/drivers/net/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c similarity index 100% rename from drivers/net/igb/igb_ethtool.c rename to drivers/net/ethernet/intel/igb/igb_ethtool.c diff --git a/drivers/net/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c similarity index 100% rename from drivers/net/igb/igb_main.c rename to drivers/net/ethernet/intel/igb/igb_main.c diff --git a/drivers/net/igbvf/Makefile b/drivers/net/ethernet/intel/igbvf/Makefile similarity index 100% rename from drivers/net/igbvf/Makefile rename to drivers/net/ethernet/intel/igbvf/Makefile diff --git a/drivers/net/igbvf/defines.h b/drivers/net/ethernet/intel/igbvf/defines.h similarity index 100% rename from drivers/net/igbvf/defines.h rename to drivers/net/ethernet/intel/igbvf/defines.h diff --git a/drivers/net/igbvf/ethtool.c b/drivers/net/ethernet/intel/igbvf/ethtool.c similarity index 100% rename from drivers/net/igbvf/ethtool.c rename to drivers/net/ethernet/intel/igbvf/ethtool.c diff --git a/drivers/net/igbvf/igbvf.h b/drivers/net/ethernet/intel/igbvf/igbvf.h similarity index 100% rename from drivers/net/igbvf/igbvf.h rename to drivers/net/ethernet/intel/igbvf/igbvf.h diff --git a/drivers/net/igbvf/mbx.c b/drivers/net/ethernet/intel/igbvf/mbx.c similarity index 100% rename from drivers/net/igbvf/mbx.c rename to drivers/net/ethernet/intel/igbvf/mbx.c diff --git a/drivers/net/igbvf/mbx.h b/drivers/net/ethernet/intel/igbvf/mbx.h similarity index 100% rename from drivers/net/igbvf/mbx.h rename to drivers/net/ethernet/intel/igbvf/mbx.h diff --git a/drivers/net/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c similarity index 100% rename from drivers/net/igbvf/netdev.c rename to drivers/net/ethernet/intel/igbvf/netdev.c diff --git a/drivers/net/igbvf/regs.h b/drivers/net/ethernet/intel/igbvf/regs.h similarity index 100% rename from drivers/net/igbvf/regs.h rename to drivers/net/ethernet/intel/igbvf/regs.h diff --git a/drivers/net/igbvf/vf.c b/drivers/net/ethernet/intel/igbvf/vf.c similarity index 100% rename from drivers/net/igbvf/vf.c rename to drivers/net/ethernet/intel/igbvf/vf.c diff --git a/drivers/net/igbvf/vf.h b/drivers/net/ethernet/intel/igbvf/vf.h similarity index 100% rename from drivers/net/igbvf/vf.h rename to drivers/net/ethernet/intel/igbvf/vf.h diff --git a/drivers/net/ixgb/Makefile b/drivers/net/ethernet/intel/ixgb/Makefile similarity index 100% rename from drivers/net/ixgb/Makefile rename to drivers/net/ethernet/intel/ixgb/Makefile diff --git a/drivers/net/ixgb/ixgb.h b/drivers/net/ethernet/intel/ixgb/ixgb.h similarity index 100% rename from drivers/net/ixgb/ixgb.h rename to drivers/net/ethernet/intel/ixgb/ixgb.h diff --git a/drivers/net/ixgb/ixgb_ee.c b/drivers/net/ethernet/intel/ixgb/ixgb_ee.c similarity index 100% rename from drivers/net/ixgb/ixgb_ee.c rename to drivers/net/ethernet/intel/ixgb/ixgb_ee.c diff --git a/drivers/net/ixgb/ixgb_ee.h b/drivers/net/ethernet/intel/ixgb/ixgb_ee.h similarity index 100% rename from drivers/net/ixgb/ixgb_ee.h rename to drivers/net/ethernet/intel/ixgb/ixgb_ee.h diff --git a/drivers/net/ixgb/ixgb_ethtool.c b/drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c similarity index 100% rename from drivers/net/ixgb/ixgb_ethtool.c rename to drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c diff --git a/drivers/net/ixgb/ixgb_hw.c b/drivers/net/ethernet/intel/ixgb/ixgb_hw.c similarity index 100% rename from drivers/net/ixgb/ixgb_hw.c rename to drivers/net/ethernet/intel/ixgb/ixgb_hw.c diff --git a/drivers/net/ixgb/ixgb_hw.h b/drivers/net/ethernet/intel/ixgb/ixgb_hw.h similarity index 100% rename from drivers/net/ixgb/ixgb_hw.h rename to drivers/net/ethernet/intel/ixgb/ixgb_hw.h diff --git a/drivers/net/ixgb/ixgb_ids.h b/drivers/net/ethernet/intel/ixgb/ixgb_ids.h similarity index 100% rename from drivers/net/ixgb/ixgb_ids.h rename to drivers/net/ethernet/intel/ixgb/ixgb_ids.h diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c similarity index 100% rename from drivers/net/ixgb/ixgb_main.c rename to drivers/net/ethernet/intel/ixgb/ixgb_main.c diff --git a/drivers/net/ixgb/ixgb_osdep.h b/drivers/net/ethernet/intel/ixgb/ixgb_osdep.h similarity index 100% rename from drivers/net/ixgb/ixgb_osdep.h rename to drivers/net/ethernet/intel/ixgb/ixgb_osdep.h diff --git a/drivers/net/ixgb/ixgb_param.c b/drivers/net/ethernet/intel/ixgb/ixgb_param.c similarity index 100% rename from drivers/net/ixgb/ixgb_param.c rename to drivers/net/ethernet/intel/ixgb/ixgb_param.c diff --git a/drivers/net/ixgbe/Makefile b/drivers/net/ethernet/intel/ixgbe/Makefile similarity index 100% rename from drivers/net/ixgbe/Makefile rename to drivers/net/ethernet/intel/ixgbe/Makefile diff --git a/drivers/net/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h similarity index 100% rename from drivers/net/ixgbe/ixgbe.h rename to drivers/net/ethernet/intel/ixgbe/ixgbe.h diff --git a/drivers/net/ixgbe/ixgbe_82598.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c similarity index 100% rename from drivers/net/ixgbe/ixgbe_82598.c rename to drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c diff --git a/drivers/net/ixgbe/ixgbe_82599.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c similarity index 100% rename from drivers/net/ixgbe/ixgbe_82599.c rename to drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c diff --git a/drivers/net/ixgbe/ixgbe_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c similarity index 100% rename from drivers/net/ixgbe/ixgbe_common.c rename to drivers/net/ethernet/intel/ixgbe/ixgbe_common.c diff --git a/drivers/net/ixgbe/ixgbe_common.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.h similarity index 100% rename from drivers/net/ixgbe/ixgbe_common.h rename to drivers/net/ethernet/intel/ixgbe/ixgbe_common.h diff --git a/drivers/net/ixgbe/ixgbe_dcb.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c similarity index 100% rename from drivers/net/ixgbe/ixgbe_dcb.c rename to drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c diff --git a/drivers/net/ixgbe/ixgbe_dcb.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.h similarity index 100% rename from drivers/net/ixgbe/ixgbe_dcb.h rename to drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.h diff --git a/drivers/net/ixgbe/ixgbe_dcb_82598.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c similarity index 100% rename from drivers/net/ixgbe/ixgbe_dcb_82598.c rename to drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c diff --git a/drivers/net/ixgbe/ixgbe_dcb_82598.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.h similarity index 100% rename from drivers/net/ixgbe/ixgbe_dcb_82598.h rename to drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.h diff --git a/drivers/net/ixgbe/ixgbe_dcb_82599.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c similarity index 100% rename from drivers/net/ixgbe/ixgbe_dcb_82599.c rename to drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c diff --git a/drivers/net/ixgbe/ixgbe_dcb_82599.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.h similarity index 100% rename from drivers/net/ixgbe/ixgbe_dcb_82599.h rename to drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.h diff --git a/drivers/net/ixgbe/ixgbe_dcb_nl.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c similarity index 100% rename from drivers/net/ixgbe/ixgbe_dcb_nl.c rename to drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c similarity index 100% rename from drivers/net/ixgbe/ixgbe_ethtool.c rename to drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c diff --git a/drivers/net/ixgbe/ixgbe_fcoe.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c similarity index 100% rename from drivers/net/ixgbe/ixgbe_fcoe.c rename to drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c diff --git a/drivers/net/ixgbe/ixgbe_fcoe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.h similarity index 100% rename from drivers/net/ixgbe/ixgbe_fcoe.h rename to drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.h diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c similarity index 100% rename from drivers/net/ixgbe/ixgbe_main.c rename to drivers/net/ethernet/intel/ixgbe/ixgbe_main.c diff --git a/drivers/net/ixgbe/ixgbe_mbx.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c similarity index 100% rename from drivers/net/ixgbe/ixgbe_mbx.c rename to drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c diff --git a/drivers/net/ixgbe/ixgbe_mbx.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h similarity index 100% rename from drivers/net/ixgbe/ixgbe_mbx.h rename to drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h diff --git a/drivers/net/ixgbe/ixgbe_phy.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c similarity index 100% rename from drivers/net/ixgbe/ixgbe_phy.c rename to drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c diff --git a/drivers/net/ixgbe/ixgbe_phy.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h similarity index 100% rename from drivers/net/ixgbe/ixgbe_phy.h rename to drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h diff --git a/drivers/net/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c similarity index 100% rename from drivers/net/ixgbe/ixgbe_sriov.c rename to drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c diff --git a/drivers/net/ixgbe/ixgbe_sriov.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h similarity index 100% rename from drivers/net/ixgbe/ixgbe_sriov.h rename to drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h diff --git a/drivers/net/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h similarity index 100% rename from drivers/net/ixgbe/ixgbe_type.h rename to drivers/net/ethernet/intel/ixgbe/ixgbe_type.h diff --git a/drivers/net/ixgbe/ixgbe_x540.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c similarity index 100% rename from drivers/net/ixgbe/ixgbe_x540.c rename to drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c diff --git a/drivers/net/ixgbevf/Makefile b/drivers/net/ethernet/intel/ixgbevf/Makefile similarity index 100% rename from drivers/net/ixgbevf/Makefile rename to drivers/net/ethernet/intel/ixgbevf/Makefile diff --git a/drivers/net/ixgbevf/defines.h b/drivers/net/ethernet/intel/ixgbevf/defines.h similarity index 100% rename from drivers/net/ixgbevf/defines.h rename to drivers/net/ethernet/intel/ixgbevf/defines.h diff --git a/drivers/net/ixgbevf/ethtool.c b/drivers/net/ethernet/intel/ixgbevf/ethtool.c similarity index 100% rename from drivers/net/ixgbevf/ethtool.c rename to drivers/net/ethernet/intel/ixgbevf/ethtool.c diff --git a/drivers/net/ixgbevf/ixgbevf.h b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h similarity index 100% rename from drivers/net/ixgbevf/ixgbevf.h rename to drivers/net/ethernet/intel/ixgbevf/ixgbevf.h diff --git a/drivers/net/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c similarity index 100% rename from drivers/net/ixgbevf/ixgbevf_main.c rename to drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c diff --git a/drivers/net/ixgbevf/mbx.c b/drivers/net/ethernet/intel/ixgbevf/mbx.c similarity index 100% rename from drivers/net/ixgbevf/mbx.c rename to drivers/net/ethernet/intel/ixgbevf/mbx.c diff --git a/drivers/net/ixgbevf/mbx.h b/drivers/net/ethernet/intel/ixgbevf/mbx.h similarity index 100% rename from drivers/net/ixgbevf/mbx.h rename to drivers/net/ethernet/intel/ixgbevf/mbx.h diff --git a/drivers/net/ixgbevf/regs.h b/drivers/net/ethernet/intel/ixgbevf/regs.h similarity index 100% rename from drivers/net/ixgbevf/regs.h rename to drivers/net/ethernet/intel/ixgbevf/regs.h diff --git a/drivers/net/ixgbevf/vf.c b/drivers/net/ethernet/intel/ixgbevf/vf.c similarity index 100% rename from drivers/net/ixgbevf/vf.c rename to drivers/net/ethernet/intel/ixgbevf/vf.c diff --git a/drivers/net/ixgbevf/vf.h b/drivers/net/ethernet/intel/ixgbevf/vf.h similarity index 100% rename from drivers/net/ixgbevf/vf.h rename to drivers/net/ethernet/intel/ixgbevf/vf.h From aa43c2158d5ae1dc76cccb08cd57a3ffd32c3825 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Fri, 8 Apr 2011 19:06:30 -0700 Subject: [PATCH 08/10] qlogic: Move the QLogic drivers Moves the QLogic drivers into drivers/net/ethernet/qlogic/ and the necessary Kconfig and Makefile changes. CC: Ron Mercer CC: Amit Kumar Salecha CC: Anirban Chakraborty Signed-off-by: Jeff Kirsher Acked-by: Anirban Chakraborty --- MAINTAINERS | 8 +-- drivers/net/Kconfig | 26 --------- drivers/net/Makefile | 3 -- drivers/net/ethernet/Kconfig | 1 + drivers/net/ethernet/Makefile | 1 + drivers/net/ethernet/qlogic/Kconfig | 53 +++++++++++++++++++ drivers/net/ethernet/qlogic/Makefile | 8 +++ .../net/{ => ethernet/qlogic}/netxen/Makefile | 0 .../{ => ethernet/qlogic}/netxen/netxen_nic.h | 0 .../qlogic}/netxen/netxen_nic_ctx.c | 0 .../qlogic}/netxen/netxen_nic_ethtool.c | 0 .../qlogic}/netxen/netxen_nic_hdr.h | 0 .../qlogic}/netxen/netxen_nic_hw.c | 0 .../qlogic}/netxen/netxen_nic_hw.h | 0 .../qlogic}/netxen/netxen_nic_init.c | 0 .../qlogic}/netxen/netxen_nic_main.c | 0 drivers/net/{ => ethernet/qlogic}/qla3xxx.c | 0 drivers/net/{ => ethernet/qlogic}/qla3xxx.h | 0 .../net/{ => ethernet/qlogic}/qlcnic/Makefile | 0 .../net/{ => ethernet/qlogic}/qlcnic/qlcnic.h | 0 .../{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c | 0 .../qlogic}/qlcnic/qlcnic_ethtool.c | 0 .../{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h | 0 .../{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c | 0 .../qlogic}/qlcnic/qlcnic_init.c | 0 .../qlogic}/qlcnic/qlcnic_main.c | 0 .../net/{ => ethernet/qlogic}/qlge/Makefile | 0 drivers/net/{ => ethernet/qlogic}/qlge/qlge.h | 0 .../net/{ => ethernet/qlogic}/qlge/qlge_dbg.c | 0 .../{ => ethernet/qlogic}/qlge/qlge_ethtool.c | 0 .../{ => ethernet/qlogic}/qlge/qlge_main.c | 0 .../net/{ => ethernet/qlogic}/qlge/qlge_mpi.c | 0 32 files changed, 67 insertions(+), 33 deletions(-) create mode 100644 drivers/net/ethernet/qlogic/Kconfig create mode 100644 drivers/net/ethernet/qlogic/Makefile rename drivers/net/{ => ethernet/qlogic}/netxen/Makefile (100%) rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic.h (100%) rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_ctx.c (100%) rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_ethtool.c (100%) rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hdr.h (100%) rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hw.c (100%) rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hw.h (100%) rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_init.c (100%) rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_main.c (100%) rename drivers/net/{ => ethernet/qlogic}/qla3xxx.c (100%) rename drivers/net/{ => ethernet/qlogic}/qla3xxx.h (100%) rename drivers/net/{ => ethernet/qlogic}/qlcnic/Makefile (100%) rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic.h (100%) rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c (100%) rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_ethtool.c (100%) rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h (100%) rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c (100%) rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_init.c (100%) rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_main.c (100%) rename drivers/net/{ => ethernet/qlogic}/qlge/Makefile (100%) rename drivers/net/{ => ethernet/qlogic}/qlge/qlge.h (100%) rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_dbg.c (100%) rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_ethtool.c (100%) rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_main.c (100%) rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_mpi.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index f4838da520c3..8f2821c30821 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4499,7 +4499,7 @@ M: Amit Kumar Salecha L: netdev@vger.kernel.org W: http://www.qlogic.com S: Supported -F: drivers/net/netxen/ +F: drivers/net/ethernet/qlogic/netxen/ NFS, SUNRPC, AND LOCKD CLIENTS M: Trond Myklebust @@ -5245,7 +5245,7 @@ M: linux-driver@qlogic.com L: netdev@vger.kernel.org S: Supported F: Documentation/networking/LICENSE.qla3xxx -F: drivers/net/qla3xxx.* +F: drivers/net/ethernet/qlogic/qla3xxx.* QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER M: Amit Kumar Salecha @@ -5253,7 +5253,7 @@ M: Anirban Chakraborty M: linux-driver@qlogic.com L: netdev@vger.kernel.org S: Supported -F: drivers/net/qlcnic/ +F: drivers/net/ethernet/qlogic/qlcnic/ QLOGIC QLGE 10Gb ETHERNET DRIVER M: Jitendra Kalsaria @@ -5261,7 +5261,7 @@ M: Ron Mercer M: linux-driver@qlogic.com L: netdev@vger.kernel.org S: Supported -F: drivers/net/qlge/ +F: drivers/net/ethernet/qlogic/qlge/ QNX4 FILESYSTEM M: Anders Larsen diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index e6491169cc6f..de2293d23d55 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -1707,15 +1707,6 @@ config XILINX_LL_TEMAC This driver supports the Xilinx 10/100/1000 LocalLink TEMAC core used in Xilinx Spartan and Virtex FPGAs -config QLA3XXX - tristate "QLogic QLA3XXX Network Driver Support" - depends on PCI - help - This driver supports QLogic ISP3XXX gigabit Ethernet cards. - - To compile this driver as a module, choose M here: the module - will be called qla3xxx. - config ATL1 tristate "Atheros/Attansic L1 Gigabit Ethernet support" depends on PCI @@ -1954,23 +1945,6 @@ config TEHUTI help Tehuti Networks 10G Ethernet NIC -config QLCNIC - tristate "QLOGIC QLCNIC 1/10Gb Converged Ethernet NIC Support" - depends on PCI - select FW_LOADER - help - This driver supports QLogic QLE8240 and QLE8242 Converged Ethernet - devices. - -config QLGE - tristate "QLogic QLGE 10Gb Ethernet Driver Support" - depends on PCI - help - This driver supports QLogic ISP8XXX 10Gb Ethernet cards. - - To compile this driver as a module, choose M here: the module - will be called qlge. - config BNA tristate "Brocade 1010/1020 10Gb Ethernet Driver support" depends on PCI diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 84b986004385..a58a9f0b7999 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -110,9 +110,6 @@ obj-$(CONFIG_MV643XX_ETH) += mv643xx_eth.o ll_temac-objs := ll_temac_main.o ll_temac_mdio.o obj-$(CONFIG_XILINX_LL_TEMAC) += ll_temac.o obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o -obj-$(CONFIG_QLA3XXX) += qla3xxx.o -obj-$(CONFIG_QLCNIC) += qlcnic/ -obj-$(CONFIG_QLGE) += qlge/ obj-$(CONFIG_PPP) += ppp_generic.o obj-$(CONFIG_PPP_ASYNC) += ppp_async.o diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index a2fd38562cb3..ab591bb96702 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -17,5 +17,6 @@ source "drivers/net/ethernet/amd/Kconfig" source "drivers/net/ethernet/broadcom/Kconfig" source "drivers/net/ethernet/chelsio/Kconfig" source "drivers/net/ethernet/intel/Kconfig" +source "drivers/net/ethernet/qlogic/Kconfig" endif # ETHERNET diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 526527177d13..d8cf120e3322 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -8,3 +8,4 @@ obj-$(CONFIG_NET_VENDOR_AMD) += amd/ obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/ obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/ obj-$(CONFIG_NET_VENDOR_INTEL) += intel/ +obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/ diff --git a/drivers/net/ethernet/qlogic/Kconfig b/drivers/net/ethernet/qlogic/Kconfig new file mode 100644 index 000000000000..a7c4424011ec --- /dev/null +++ b/drivers/net/ethernet/qlogic/Kconfig @@ -0,0 +1,53 @@ +# +# QLogic network device configuration +# + +config NET_VENDOR_QLOGIC + bool "QLogic devices" + depends on PCI + ---help--- + If you have a network (Ethernet) card belonging to this class, say Y + and read the Ethernet-HOWTO, available from + . + + 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 QLogic cards. If you say Y, you will be asked for + your specific card in the following questions. + +if NET_VENDOR_QLOGIC + +config QLA3XXX + tristate "QLogic QLA3XXX Network Driver Support" + depends on PCI + ---help--- + This driver supports QLogic ISP3XXX gigabit Ethernet cards. + + To compile this driver as a module, choose M here: the module + will be called qla3xxx. + +config QLCNIC + tristate "QLOGIC QLCNIC 1/10Gb Converged Ethernet NIC Support" + depends on PCI + select FW_LOADER + ---help--- + This driver supports QLogic QLE8240 and QLE8242 Converged Ethernet + devices. + +config QLGE + tristate "QLogic QLGE 10Gb Ethernet Driver Support" + depends on PCI + ---help--- + This driver supports QLogic ISP8XXX 10Gb Ethernet cards. + + To compile this driver as a module, choose M here: the module + will be called qlge. + +config NETXEN_NIC + tristate "NetXen Multi port (1/10) Gigabit Ethernet NIC" + depends on PCI + select FW_LOADER + ---help--- + This enables the support for NetXen's Gigabit Ethernet card. + +endif # NET_VENDOR_QLOGIC diff --git a/drivers/net/ethernet/qlogic/Makefile b/drivers/net/ethernet/qlogic/Makefile new file mode 100644 index 000000000000..b2a283d9ae60 --- /dev/null +++ b/drivers/net/ethernet/qlogic/Makefile @@ -0,0 +1,8 @@ +# +# Makefile for the QLogic network device drivers. +# + +obj-$(CONFIG_QLA3XXX) += qla3xxx.o +obj-$(CONFIG_QLCNIC) += qlcnic/ +obj-$(CONFIG_QLGE) += qlge/ +obj-$(CONFIG_NETXEN_NIC) += netxen/ diff --git a/drivers/net/netxen/Makefile b/drivers/net/ethernet/qlogic/netxen/Makefile similarity index 100% rename from drivers/net/netxen/Makefile rename to drivers/net/ethernet/qlogic/netxen/Makefile diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/ethernet/qlogic/netxen/netxen_nic.h similarity index 100% rename from drivers/net/netxen/netxen_nic.h rename to drivers/net/ethernet/qlogic/netxen/netxen_nic.h diff --git a/drivers/net/netxen/netxen_nic_ctx.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c similarity index 100% rename from drivers/net/netxen/netxen_nic_ctx.c rename to drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c similarity index 100% rename from drivers/net/netxen/netxen_nic_ethtool.c rename to drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c diff --git a/drivers/net/netxen/netxen_nic_hdr.h b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hdr.h similarity index 100% rename from drivers/net/netxen/netxen_nic_hdr.h rename to drivers/net/ethernet/qlogic/netxen/netxen_nic_hdr.h diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c similarity index 100% rename from drivers/net/netxen/netxen_nic_hw.c rename to drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c diff --git a/drivers/net/netxen/netxen_nic_hw.h b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.h similarity index 100% rename from drivers/net/netxen/netxen_nic_hw.h rename to drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.h diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c similarity index 100% rename from drivers/net/netxen/netxen_nic_init.c rename to drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c similarity index 100% rename from drivers/net/netxen/netxen_nic_main.c rename to drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c diff --git a/drivers/net/qla3xxx.c b/drivers/net/ethernet/qlogic/qla3xxx.c similarity index 100% rename from drivers/net/qla3xxx.c rename to drivers/net/ethernet/qlogic/qla3xxx.c diff --git a/drivers/net/qla3xxx.h b/drivers/net/ethernet/qlogic/qla3xxx.h similarity index 100% rename from drivers/net/qla3xxx.h rename to drivers/net/ethernet/qlogic/qla3xxx.h diff --git a/drivers/net/qlcnic/Makefile b/drivers/net/ethernet/qlogic/qlcnic/Makefile similarity index 100% rename from drivers/net/qlcnic/Makefile rename to drivers/net/ethernet/qlogic/qlcnic/Makefile diff --git a/drivers/net/qlcnic/qlcnic.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h similarity index 100% rename from drivers/net/qlcnic/qlcnic.h rename to drivers/net/ethernet/qlogic/qlcnic/qlcnic.h diff --git a/drivers/net/qlcnic/qlcnic_ctx.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c similarity index 100% rename from drivers/net/qlcnic/qlcnic_ctx.c rename to drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c diff --git a/drivers/net/qlcnic/qlcnic_ethtool.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c similarity index 100% rename from drivers/net/qlcnic/qlcnic_ethtool.c rename to drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c diff --git a/drivers/net/qlcnic/qlcnic_hdr.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h similarity index 100% rename from drivers/net/qlcnic/qlcnic_hdr.h rename to drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h diff --git a/drivers/net/qlcnic/qlcnic_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c similarity index 100% rename from drivers/net/qlcnic/qlcnic_hw.c rename to drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c diff --git a/drivers/net/qlcnic/qlcnic_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c similarity index 100% rename from drivers/net/qlcnic/qlcnic_init.c rename to drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c similarity index 100% rename from drivers/net/qlcnic/qlcnic_main.c rename to drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c diff --git a/drivers/net/qlge/Makefile b/drivers/net/ethernet/qlogic/qlge/Makefile similarity index 100% rename from drivers/net/qlge/Makefile rename to drivers/net/ethernet/qlogic/qlge/Makefile diff --git a/drivers/net/qlge/qlge.h b/drivers/net/ethernet/qlogic/qlge/qlge.h similarity index 100% rename from drivers/net/qlge/qlge.h rename to drivers/net/ethernet/qlogic/qlge/qlge.h diff --git a/drivers/net/qlge/qlge_dbg.c b/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c similarity index 100% rename from drivers/net/qlge/qlge_dbg.c rename to drivers/net/ethernet/qlogic/qlge/qlge_dbg.c diff --git a/drivers/net/qlge/qlge_ethtool.c b/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c similarity index 100% rename from drivers/net/qlge/qlge_ethtool.c rename to drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c similarity index 100% rename from drivers/net/qlge/qlge_main.c rename to drivers/net/ethernet/qlogic/qlge/qlge_main.c diff --git a/drivers/net/qlge/qlge_mpi.c b/drivers/net/ethernet/qlogic/qlge/qlge_mpi.c similarity index 100% rename from drivers/net/qlge/qlge_mpi.c rename to drivers/net/ethernet/qlogic/qlge/qlge_mpi.c From ae150435b59e68de00546330241727f2fec54517 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Thu, 12 May 2011 20:21:07 -0700 Subject: [PATCH 09/10] smsc: Move the SMC (SMSC) drivers Moves the SMC (SMSC) drivers into drivers/net/ethernet/smsc/ and the necessary Kconfig and Makefile changes. Also did some cleanup of NET_VENDOR_SMC Kconfig tag for the 8390 based drivers. CC: Nicolas Pitre CC: Donald Becker CC: Erik Stahlman CC: Dustin McIntire CC: Steve Glendinning CC: David Hinds Signed-off-by: Jeff Kirsher --- MAINTAINERS | 6 +- drivers/net/Kconfig | 105 -------------- drivers/net/Makefile | 7 - drivers/net/ethernet/8390/Kconfig | 21 +-- drivers/net/ethernet/Kconfig | 1 + drivers/net/ethernet/Makefile | 1 + drivers/net/ethernet/smsc/Kconfig | 131 ++++++++++++++++++ drivers/net/ethernet/smsc/Makefile | 11 ++ drivers/net/{ => ethernet/smsc}/epic100.c | 0 drivers/net/{ => ethernet/smsc}/smc911x.c | 0 drivers/net/{ => ethernet/smsc}/smc911x.h | 0 drivers/net/{ => ethernet/smsc}/smc9194.c | 0 drivers/net/{ => ethernet/smsc}/smc9194.h | 0 .../{pcmcia => ethernet/smsc}/smc91c92_cs.c | 0 drivers/net/{ => ethernet/smsc}/smc91x.c | 0 drivers/net/{ => ethernet/smsc}/smc91x.h | 0 drivers/net/{ => ethernet/smsc}/smsc911x.c | 0 drivers/net/{ => ethernet/smsc}/smsc911x.h | 0 drivers/net/{ => ethernet/smsc}/smsc9420.c | 0 drivers/net/{ => ethernet/smsc}/smsc9420.h | 0 drivers/net/pcmcia/Kconfig | 11 -- drivers/net/pcmcia/Makefile | 1 - 22 files changed, 151 insertions(+), 144 deletions(-) create mode 100644 drivers/net/ethernet/smsc/Kconfig create mode 100644 drivers/net/ethernet/smsc/Makefile rename drivers/net/{ => ethernet/smsc}/epic100.c (100%) rename drivers/net/{ => ethernet/smsc}/smc911x.c (100%) rename drivers/net/{ => ethernet/smsc}/smc911x.h (100%) rename drivers/net/{ => ethernet/smsc}/smc9194.c (100%) rename drivers/net/{ => ethernet/smsc}/smc9194.h (100%) rename drivers/net/{pcmcia => ethernet/smsc}/smc91c92_cs.c (100%) rename drivers/net/{ => ethernet/smsc}/smc91x.c (100%) rename drivers/net/{ => ethernet/smsc}/smc91x.h (100%) rename drivers/net/{ => ethernet/smsc}/smsc911x.c (100%) rename drivers/net/{ => ethernet/smsc}/smsc911x.h (100%) rename drivers/net/{ => ethernet/smsc}/smsc9420.c (100%) rename drivers/net/{ => ethernet/smsc}/smsc9420.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 8f2821c30821..7c0294cdf9f1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5869,7 +5869,7 @@ F: mm/sl?b.c SMC91x ETHERNET DRIVER M: Nicolas Pitre S: Odd Fixes -F: drivers/net/smc91x.* +F: drivers/net/ethernet/smsc/smc91x.* SMM665 HARDWARE MONITOR DRIVER M: Guenter Roeck @@ -5904,13 +5904,13 @@ M: Steve Glendinning L: netdev@vger.kernel.org S: Supported F: include/linux/smsc911x.h -F: drivers/net/smsc911x.* +F: drivers/net/ethernet/smsc/smsc911x.* SMSC9420 PCI ETHERNET DRIVER M: Steve Glendinning L: netdev@vger.kernel.org S: Supported -F: drivers/net/smsc9420.* +F: drivers/net/ethernet/smsc/smsc9420.* SN-IA64 (Itanium) SUB-PLATFORM M: Jes Sorensen diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index de2293d23d55..649918609cb6 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -565,39 +565,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 - and the Ethernet-HOWTO, - available from . - - 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 - select MII - depends on ARM || M32R || SUPERH || \ - MIPS || BLACKFIN || MN10300 || COLDFIRE - help - This is a driver for SMC's 91x series of Ethernet chipsets, - including the SMC91C94 and the SMC91C111. Say Y if you want it - compiled into the kernel, and read the file - and the Ethernet-HOWTO, - available from . - - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called smc91x. If you want to compile it as a - module, say M here and read . - config PXA168_ETH tristate "Marvell pxa168 ethernet support" depends on CPU_PXA168 @@ -712,44 +679,6 @@ config GRETH help Say Y here if you want to use the Aeroflex Gaisler GRETH Ethernet MAC. -config SMC911X - tristate "SMSC LAN911[5678] support" - select CRC32 - select MII - depends on ARM || SUPERH || MN10300 - help - This is a driver for SMSC's LAN911x series of Ethernet chipsets - including the new LAN9115, LAN9116, LAN9117, and LAN9118. - Say Y if you want it compiled into the kernel, - and read the Ethernet-HOWTO, available from - . - - This driver is also available as a module. The module will be - called smc911x. If you want to compile it as a module, say M - here and read - -config SMSC911X - tristate "SMSC LAN911x/LAN921x families embedded ethernet support" - depends on ARM || SUPERH || BLACKFIN || MIPS || MN10300 - select CRC32 - select MII - select PHYLIB - ---help--- - Say Y here if you want support for SMSC LAN911x and LAN921x families - of ethernet controllers. - - To compile this driver as a module, choose M here and read - . The module - will be called smsc911x. - -config SMSC911X_ARCH_HOOKS - def_bool n - depends on SMSC911X - help - If the arch enables this, it allows the arch to implement various - hooks for more comprehensive interrupt control and also to override - the source of the MAC address. - config NET_VENDOR_RACAL bool "Racal-Interlan (Micom) NI cards" depends on ISA @@ -1148,33 +1077,6 @@ config SIS900 To compile this driver as a module, choose M here: the module will be called sis900. This is recommended. -config EPIC100 - tristate "SMC EtherPower II" - depends on NET_PCI && PCI - select CRC32 - select MII - help - This driver is for the SMC EtherPower II 9432 PCI Ethernet NIC, - which is based on the SMC83c17x (EPIC/100). - More specific information and updates are available from - . - -config SMSC9420 - tristate "SMSC LAN9420 PCI ethernet adapter support" - depends on NET_PCI && PCI - select CRC32 - select PHYLIB - select SMSC_PHY - help - This is a driver for SMSC's LAN9420 PCI ethernet adapter. - Say Y if you want it compiled into the kernel, - and read the Ethernet-HOWTO, available from - . - - This driver is also available as a module. The module will be - called smsc9420. If you want to compile it as a module, say M - here and read - config SUNDANCE tristate "Sundance Alta support" depends on NET_PCI && PCI @@ -1891,13 +1793,6 @@ config MYRI10GE_DCA driver. DCA is a method for warming the CPU cache before data is used, with the intent of lessening the impact of cache misses. -config NETXEN_NIC - tristate "NetXen Multi port (1/10) Gigabit Ethernet NIC" - depends on PCI - select FW_LOADER - help - This enables the support for NetXen's Gigabit Ethernet card. - config NIU tristate "Sun Neptune 10Gbit Ethernet support" depends on PCI diff --git a/drivers/net/Makefile b/drivers/net/Makefile index a58a9f0b7999..e74b4244ee7f 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -55,8 +55,6 @@ obj-$(CONFIG_MACE) += mace.o obj-$(CONFIG_BMAC) += bmac.o obj-$(CONFIG_TLAN) += tlan.o -obj-$(CONFIG_EPIC100) += epic100.o -obj-$(CONFIG_SMSC9420) += smsc9420.o obj-$(CONFIG_SIS190) += sis190.o obj-$(CONFIG_SIS900) += sis900.o obj-$(CONFIG_R6040) += r6040.o @@ -95,7 +93,6 @@ 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) @@ -182,9 +179,6 @@ obj-$(CONFIG_IBMVETH) += ibmveth.o obj-$(CONFIG_S2IO) += s2io.o obj-$(CONFIG_VXGE) += vxge/ obj-$(CONFIG_MYRI10GE) += myri10ge/ -obj-$(CONFIG_SMC91X) += smc91x.o -obj-$(CONFIG_SMC911X) += smc911x.o -obj-$(CONFIG_SMSC911X) += smsc911x.o obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o obj-$(CONFIG_BFIN_MAC) += bfin_mac.o obj-$(CONFIG_DM9000) += dm9000.o @@ -231,7 +225,6 @@ obj-$(CONFIG_NETCONSOLE) += netconsole.o obj-$(CONFIG_FS_ENET) += fs_enet/ -obj-$(CONFIG_NETXEN_NIC) += netxen/ obj-$(CONFIG_NIU) += niu.o obj-$(CONFIG_VIRTIO_NET) += virtio_net.o obj-$(CONFIG_SFC) += sfc/ diff --git a/drivers/net/ethernet/8390/Kconfig b/drivers/net/ethernet/8390/Kconfig index 5cd53f1b84d3..f1b9bddc1550 100644 --- a/drivers/net/ethernet/8390/Kconfig +++ b/drivers/net/ethernet/8390/Kconfig @@ -264,22 +264,9 @@ config STNIC If unsure, say N. -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 - . - - 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 ULTRAMCA tristate "SMC Ultra MCA support" - depends on NET_VENDOR_SMC && MCA + depends on MCA select CRC32 ---help--- If you have a network (Ethernet) card of this type and are running @@ -291,7 +278,7 @@ config ULTRAMCA config ULTRA tristate "SMC Ultra support" - depends on NET_VENDOR_SMC && ISA + depends on ISA select CRC32 ---help--- If you have a network (Ethernet) card of this type, say Y and read @@ -310,7 +297,7 @@ config ULTRA config ULTRA32 tristate "SMC Ultra32 EISA support" - depends on NET_VENDOR_SMC && EISA + depends on EISA select CRC32 ---help--- If you have a network (Ethernet) card of this type, say Y and read @@ -322,7 +309,7 @@ config ULTRA32 config WD80x3 tristate "WD80*3 support" - depends on NET_VENDOR_SMC && ISA + depends on ISA select CRC32 ---help--- If you have a network (Ethernet) card of this type, say Y and read diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index ab591bb96702..ed5836ccb8d6 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -18,5 +18,6 @@ source "drivers/net/ethernet/broadcom/Kconfig" source "drivers/net/ethernet/chelsio/Kconfig" source "drivers/net/ethernet/intel/Kconfig" source "drivers/net/ethernet/qlogic/Kconfig" +source "drivers/net/ethernet/smsc/Kconfig" endif # ETHERNET diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index d8cf120e3322..983fd2752151 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -9,3 +9,4 @@ obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/ obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/ obj-$(CONFIG_NET_VENDOR_INTEL) += intel/ obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/ +obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/ diff --git a/drivers/net/ethernet/smsc/Kconfig b/drivers/net/ethernet/smsc/Kconfig new file mode 100644 index 000000000000..702efe686c48 --- /dev/null +++ b/drivers/net/ethernet/smsc/Kconfig @@ -0,0 +1,131 @@ +# +# Western Digital/SMC network device configuration +# + +config NET_VENDOR_SMSC + bool "SMC (SMSC)/Western Digital devices" + depends on ARM || ISA || MAC || ARM || MIPS || M32R || SUPERH || \ + BLACKFIN || MN10300 || COLDFIRE || PCI || PCMCIA + ---help--- + If you have a network (Ethernet) card belonging to this class, say Y + and read the Ethernet-HOWTO, available from + . + + 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 SMC/Western Digital cards. If you say Y, you will + be asked for your specific card in the following questions. + +if NET_VENDOR_SMSC + +config SMC9194 + tristate "SMC 9194 support" + depends on (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 + and the Ethernet-HOWTO, + available from . + + 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 + select MII + depends on (ARM || M32R || SUPERH || MIPS || BLACKFIN || \ + MN10300 || COLDFIRE) + ---help--- + This is a driver for SMC's 91x series of Ethernet chipsets, + including the SMC91C94 and the SMC91C111. Say Y if you want it + compiled into the kernel, and read the file + and the Ethernet-HOWTO, + available from . + + This driver is also available as a module ( = code which can be + inserted in and removed from the running kernel whenever you want). + The module will be called smc91x. If you want to compile it as a + module, say M here and read . + +config PCMCIA_SMC91C92 + tristate "SMC 91Cxx PCMCIA support" + depends on PCMCIA + select CRC32 + select MII + ---help--- + Say Y here if you intend to attach an SMC 91Cxx compatible PCMCIA + (PC-card) Ethernet or Fast Ethernet card to your computer. + + To compile this driver as a module, choose M here: the module will be + called smc91c92_cs. If unsure, say N. + +config EPIC100 + tristate "SMC EtherPower II" + depends on PCI + select CRC32 + select MII + ---help--- + This driver is for the SMC EtherPower II 9432 PCI Ethernet NIC, + which is based on the SMC83c17x (EPIC/100). + More specific information and updates are available from + . + +config SMC911X + tristate "SMSC LAN911[5678] support" + select CRC32 + select MII + depends on (ARM || SUPERH || MN10300) + ---help--- + This is a driver for SMSC's LAN911x series of Ethernet chipsets + including the new LAN9115, LAN9116, LAN9117, and LAN9118. + Say Y if you want it compiled into the kernel, + and read the Ethernet-HOWTO, available from + . + + This driver is also available as a module. The module will be + called smc911x. If you want to compile it as a module, say M + here and read + +config SMSC911X + tristate "SMSC LAN911x/LAN921x families embedded ethernet support" + depends on (ARM || SUPERH || BLACKFIN || MIPS || MN10300) + select CRC32 + select MII + select PHYLIB + ---help--- + Say Y here if you want support for SMSC LAN911x and LAN921x families + of ethernet controllers. + + To compile this driver as a module, choose M here and read + . The module + will be called smsc911x. + +config SMSC911X_ARCH_HOOKS + def_bool n + depends on SMSC911X + ---help--- + If the arch enables this, it allows the arch to implement various + hooks for more comprehensive interrupt control and also to override + the source of the MAC address. + +config SMSC9420 + tristate "SMSC LAN9420 PCI ethernet adapter support" + depends on PCI + select CRC32 + select PHYLIB + select SMSC_PHY + ---help--- + This is a driver for SMSC's LAN9420 PCI ethernet adapter. + Say Y if you want it compiled into the kernel, + and read the Ethernet-HOWTO, available from + . + + This driver is also available as a module. The module will be + called smsc9420. If you want to compile it as a module, say M + here and read + +endif # NET_VENDOR_SMSC diff --git a/drivers/net/ethernet/smsc/Makefile b/drivers/net/ethernet/smsc/Makefile new file mode 100644 index 000000000000..f3438dec9d90 --- /dev/null +++ b/drivers/net/ethernet/smsc/Makefile @@ -0,0 +1,11 @@ +# +# Makefile for the SMSC network device drivers. +# + +obj-$(CONFIG_SMC9194) += smc9194.o +obj-$(CONFIG_SMC91X) += smc91x.o +obj-$(CONFIG_PCMCIA_SMC91C92) += smc91c92_cs.o +obj-$(CONFIG_EPIC100) += epic100.o +obj-$(CONFIG_SMSC9420) += smsc9420.o +obj-$(CONFIG_SMC911X) += smc911x.o +obj-$(CONFIG_SMSC911X) += smsc911x.o diff --git a/drivers/net/epic100.c b/drivers/net/ethernet/smsc/epic100.c similarity index 100% rename from drivers/net/epic100.c rename to drivers/net/ethernet/smsc/epic100.c diff --git a/drivers/net/smc911x.c b/drivers/net/ethernet/smsc/smc911x.c similarity index 100% rename from drivers/net/smc911x.c rename to drivers/net/ethernet/smsc/smc911x.c diff --git a/drivers/net/smc911x.h b/drivers/net/ethernet/smsc/smc911x.h similarity index 100% rename from drivers/net/smc911x.h rename to drivers/net/ethernet/smsc/smc911x.h diff --git a/drivers/net/smc9194.c b/drivers/net/ethernet/smsc/smc9194.c similarity index 100% rename from drivers/net/smc9194.c rename to drivers/net/ethernet/smsc/smc9194.c diff --git a/drivers/net/smc9194.h b/drivers/net/ethernet/smsc/smc9194.h similarity index 100% rename from drivers/net/smc9194.h rename to drivers/net/ethernet/smsc/smc9194.h diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/ethernet/smsc/smc91c92_cs.c similarity index 100% rename from drivers/net/pcmcia/smc91c92_cs.c rename to drivers/net/ethernet/smsc/smc91c92_cs.c diff --git a/drivers/net/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c similarity index 100% rename from drivers/net/smc91x.c rename to drivers/net/ethernet/smsc/smc91x.c diff --git a/drivers/net/smc91x.h b/drivers/net/ethernet/smsc/smc91x.h similarity index 100% rename from drivers/net/smc91x.h rename to drivers/net/ethernet/smsc/smc91x.h diff --git a/drivers/net/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c similarity index 100% rename from drivers/net/smsc911x.c rename to drivers/net/ethernet/smsc/smsc911x.c diff --git a/drivers/net/smsc911x.h b/drivers/net/ethernet/smsc/smsc911x.h similarity index 100% rename from drivers/net/smsc911x.h rename to drivers/net/ethernet/smsc/smsc911x.h diff --git a/drivers/net/smsc9420.c b/drivers/net/ethernet/smsc/smsc9420.c similarity index 100% rename from drivers/net/smsc9420.c rename to drivers/net/ethernet/smsc/smsc9420.c diff --git a/drivers/net/smsc9420.h b/drivers/net/ethernet/smsc/smsc9420.h similarity index 100% rename from drivers/net/smsc9420.h rename to drivers/net/ethernet/smsc/smsc9420.h diff --git a/drivers/net/pcmcia/Kconfig b/drivers/net/pcmcia/Kconfig index 72aa25786a95..f5a738ff59f5 100644 --- a/drivers/net/pcmcia/Kconfig +++ b/drivers/net/pcmcia/Kconfig @@ -31,17 +31,6 @@ config PCMCIA_FMVJ18X To compile this driver as a module, choose M here: the module will be called fmvj18x_cs. If unsure, say N. -config PCMCIA_SMC91C92 - tristate "SMC 91Cxx PCMCIA support" - select CRC32 - select MII - help - Say Y here if you intend to attach an SMC 91Cxx compatible PCMCIA - (PC-card) Ethernet or Fast Ethernet card to your computer. - - To compile this driver as a module, choose M here: the module will be - called smc91c92_cs. If unsure, say N. - config PCMCIA_XIRC2PS tristate "Xircom 16-bit PCMCIA support" help diff --git a/drivers/net/pcmcia/Makefile b/drivers/net/pcmcia/Makefile index c2b8b44c7bb1..f9c98836d75b 100644 --- a/drivers/net/pcmcia/Makefile +++ b/drivers/net/pcmcia/Makefile @@ -4,7 +4,6 @@ # 16-bit client drivers obj-$(CONFIG_PCMCIA_FMVJ18X) += fmvj18x_cs.o -obj-$(CONFIG_PCMCIA_SMC91C92) += smc91c92_cs.o obj-$(CONFIG_PCMCIA_XIRC2PS) += xirc2ps_cs.o obj-$(CONFIG_ARCNET_COM20020_CS)+= com20020_cs.o From 115978859272b958366d4a08c99a24f9625fa663 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Wed, 13 Jul 2011 15:38:08 -0700 Subject: [PATCH 10/10] i825xx: Move the Intel 82586/82593/82596 based drivers Move the drivers that use the i82586/i82593/i82596 chipsets into drivers/net/ethernet/i825xx/ and make the necessary Kconfig and Makefile changes. There were 4 3Com drivers which were initially moved into 3com/, which now reside in i825xx since they all used the i82586 chip. CC: Philip Blundell CC: Russell King CC: CC: Donald Becker CC: Chris Beauregard CC: Richard Procter CC: Andries Brouwer CC: "M.Hipp" CC: Richard Hirst CC: Sam Creasey CC: Thomas Bogendoerfer Signed-off-by: Jeff Kirsher --- MAINTAINERS | 6 +- drivers/net/Kconfig | 167 +--------------- drivers/net/Makefile | 17 -- drivers/net/arm/Kconfig | 7 - drivers/net/arm/Makefile | 1 - drivers/net/ethernet/Kconfig | 1 + drivers/net/ethernet/Makefile | 1 + drivers/net/{ => ethernet/i825xx}/3c505.c | 0 drivers/net/{ => ethernet/i825xx}/3c505.h | 0 drivers/net/{ => ethernet/i825xx}/3c507.c | 0 drivers/net/{ => ethernet/i825xx}/3c523.c | 0 drivers/net/{ => ethernet/i825xx}/3c523.h | 0 drivers/net/{ => ethernet/i825xx}/3c527.c | 0 drivers/net/{ => ethernet/i825xx}/3c527.h | 0 drivers/net/{ => ethernet/i825xx}/82596.c | 0 drivers/net/ethernet/i825xx/Kconfig | 182 ++++++++++++++++++ drivers/net/ethernet/i825xx/Makefile | 20 ++ drivers/net/{ => ethernet/i825xx}/eepro.c | 0 drivers/net/{ => ethernet/i825xx}/eexpress.c | 0 drivers/net/{ => ethernet/i825xx}/eexpress.h | 0 drivers/net/{arm => ethernet/i825xx}/ether1.c | 0 drivers/net/{arm => ethernet/i825xx}/ether1.h | 0 .../net/{ => ethernet/i825xx}/lasi_82596.c | 0 drivers/net/{ => ethernet/i825xx}/lib82596.c | 0 drivers/net/{ => ethernet/i825xx}/lp486e.c | 0 drivers/net/{ => ethernet/i825xx}/ni52.c | 0 drivers/net/{ => ethernet/i825xx}/ni52.h | 0 drivers/net/{ => ethernet/i825xx}/sni_82596.c | 0 .../net/{ => ethernet/i825xx}/sun3_82586.c | 0 .../net/{ => ethernet/i825xx}/sun3_82586.h | 0 drivers/net/{ => ethernet/i825xx}/znet.c | 0 31 files changed, 208 insertions(+), 194 deletions(-) rename drivers/net/{ => ethernet/i825xx}/3c505.c (100%) rename drivers/net/{ => ethernet/i825xx}/3c505.h (100%) rename drivers/net/{ => ethernet/i825xx}/3c507.c (100%) rename drivers/net/{ => ethernet/i825xx}/3c523.c (100%) rename drivers/net/{ => ethernet/i825xx}/3c523.h (100%) rename drivers/net/{ => ethernet/i825xx}/3c527.c (100%) rename drivers/net/{ => ethernet/i825xx}/3c527.h (100%) rename drivers/net/{ => ethernet/i825xx}/82596.c (100%) create mode 100644 drivers/net/ethernet/i825xx/Kconfig create mode 100644 drivers/net/ethernet/i825xx/Makefile rename drivers/net/{ => ethernet/i825xx}/eepro.c (100%) rename drivers/net/{ => ethernet/i825xx}/eexpress.c (100%) rename drivers/net/{ => ethernet/i825xx}/eexpress.h (100%) rename drivers/net/{arm => ethernet/i825xx}/ether1.c (100%) rename drivers/net/{arm => ethernet/i825xx}/ether1.h (100%) rename drivers/net/{ => ethernet/i825xx}/lasi_82596.c (100%) rename drivers/net/{ => ethernet/i825xx}/lib82596.c (100%) rename drivers/net/{ => ethernet/i825xx}/lp486e.c (100%) rename drivers/net/{ => ethernet/i825xx}/ni52.c (100%) rename drivers/net/{ => ethernet/i825xx}/ni52.h (100%) rename drivers/net/{ => ethernet/i825xx}/sni_82596.c (100%) rename drivers/net/{ => ethernet/i825xx}/sun3_82586.c (100%) rename drivers/net/{ => ethernet/i825xx}/sun3_82586.h (100%) rename drivers/net/{ => ethernet/i825xx}/znet.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 7c0294cdf9f1..5b368ccf7572 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -117,7 +117,7 @@ Maintainers List (try to look for most precise areas first) M: Philip Blundell L: netdev@vger.kernel.org S: Maintained -F: drivers/net/3c505* +F: drivers/net/ethernet/i825xx/3c505* 3C59X NETWORK DRIVER M: Steffen Klassert @@ -1014,7 +1014,7 @@ F: arch/arm/include/asm/hardware/ioc.h F: arch/arm/include/asm/hardware/iomd.h F: arch/arm/include/asm/hardware/memc.h F: arch/arm/mach-rpc/ -F: drivers/net/arm/ether* +F: drivers/net/arm/ether3* F: drivers/scsi/arm/ ARM/SHARK MACHINE SUPPORT @@ -2510,7 +2510,7 @@ ETHEREXPRESS-16 NETWORK DRIVER M: Philip Blundell L: netdev@vger.kernel.org S: Maintained -F: drivers/net/eexpress.* +F: drivers/net/ethernet/i825xx/eexpress.* ETHERNET BRIDGE M: Stephen Hemminger diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 649918609cb6..d7d0b3532bc3 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -306,47 +306,6 @@ config MACMACE say Y and read the Ethernet-HOWTO, available from . -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 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 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 @@ -462,63 +421,6 @@ config SUNVNET help Support for virtual network devices under Sun Logical Domains. -config EL2 - tristate "3c503 \"EtherLink II\" support" - depends on ISA - select CRC32 - ---help--- - If you have a network (Ethernet) card of this type, say Y and read - the Ethernet-HOWTO, available from - . - - 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 ISA && ISA_DMA_API - ---help--- - Information about this network (Ethernet) card can be found in - . If you have a card of - this type, say Y and read the Ethernet-HOWTO, available from - . - - 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 ISA && EXPERIMENTAL - ---help--- - If you have a network (Ethernet) card of this type, say Y and read - the Ethernet-HOWTO, available from - . - - To compile this driver as a module, choose M here. The module - will be called 3c507. - -config ELMC - tristate "3c523 \"EtherLink/MC\" support" - depends on MCA_LEGACY - ---help--- - If you have a network (Ethernet) card of this type, say Y and read - the Ethernet-HOWTO, available from - . - - 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 MCA && MCA_LEGACY - ---help--- - If you have a network (Ethernet) card of this type, say Y and read - the Ethernet-HOWTO, available from - . - - To compile this driver as a module, choose M here. The module - will be called 3c527. - config BFIN_MAC tristate "Blackfin on-chip MAC support" depends on NET_ETHERNET && (BF516 || BF518 || BF526 || BF527 || BF536 || BF537) @@ -684,7 +586,7 @@ config NET_VENDOR_RACAL 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, + as the NI5010, say Y and read the Ethernet-HOWTO, available from . Note that the answer to this question doesn't directly affect the @@ -704,17 +606,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 - . - - To compile this driver as a module, choose M here. The module - will be called ni52. - config DNET tristate "Dave ethernet support (DNET)" depends on NET_ETHERNET && HAS_IOMEM @@ -782,41 +673,6 @@ config EWRK3 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 - ---help--- - If you have an EtherExpress16 network (Ethernet) card, say Y and - read the Ethernet-HOWTO, available from - . 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 - . - - To compile this driver as a module, choose M here. The module - will be called eepro. - -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 @@ -828,16 +684,6 @@ config ETH16I To compile this driver as a module, choose M here. The module will be called eth16i. -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 - . - config SEEQ8005 tristate "SEEQ8005 support (EXPERIMENTAL)" depends on NET_ISA && EXPERIMENTAL @@ -915,17 +761,6 @@ config KSZ884X_PCI To compile this driver as a module, choose M here. The module will be called ksz884x. -config APRICOT - tristate "Apricot Xen-II on board Ethernet" - depends on NET_PCI && ISA - help - If you have a network (Ethernet) controller of this type, say Y and - read the Ethernet-HOWTO, available from - . - - To compile this driver as a module, choose M here. The module - will be called apricot. - config FORCEDETH tristate "nForce Ethernet support" depends on NET_PCI && PCI diff --git a/drivers/net/Makefile b/drivers/net/Makefile index e74b4244ee7f..49b3e87075d3 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -130,36 +130,19 @@ obj-$(CONFIG_MACVLAN) += macvlan.o obj-$(CONFIG_MACVTAP) += macvtap.o obj-$(CONFIG_DE600) += de600.o obj-$(CONFIG_DE620) += de620.o -obj-$(CONFIG_SUN3_82586) += sun3_82586.o obj-$(CONFIG_DEFXX) += defxx.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_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_EWRK3) += ewrk3.o obj-$(CONFIG_ATP) += atp.o obj-$(CONFIG_NI5010) += ni5010.o -obj-$(CONFIG_NI52) += ni52.o -obj-$(CONFIG_ELPLUS) += 3c505.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_EQUALIZER) += eql.o obj-$(CONFIG_KORINA) += korina.o diff --git a/drivers/net/arm/Kconfig b/drivers/net/arm/Kconfig index 715bf2acc24b..7848b5f67013 100644 --- a/drivers/net/arm/Kconfig +++ b/drivers/net/arm/Kconfig @@ -3,13 +3,6 @@ # These are for Acorn's Expansion card network interfaces # -config ARM_ETHER1 - tristate "Acorn Ether1 support" - depends on ARM && ARCH_ACORN - help - If you have an Acorn system with one of these (AKA25) network cards, - you should say Y to this option if you wish to use it with Linux. - config ARM_ETHER3 tristate "Acorn/ANT Ether3 support" depends on ARM && ARCH_ACORN diff --git a/drivers/net/arm/Makefile b/drivers/net/arm/Makefile index f1e6150b6757..6cca728b8094 100644 --- a/drivers/net/arm/Makefile +++ b/drivers/net/arm/Makefile @@ -4,7 +4,6 @@ # obj-$(CONFIG_ARM_ETHER3) += ether3.o -obj-$(CONFIG_ARM_ETHER1) += ether1.o obj-$(CONFIG_ARM_AT91_ETHER) += at91_ether.o obj-$(CONFIG_ARM_KS8695_ETHER) += ks8695net.o obj-$(CONFIG_EP93XX_ETH) += ep93xx_eth.o diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index ed5836ccb8d6..d0a8fa8ab7ec 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -17,6 +17,7 @@ source "drivers/net/ethernet/amd/Kconfig" source "drivers/net/ethernet/broadcom/Kconfig" source "drivers/net/ethernet/chelsio/Kconfig" source "drivers/net/ethernet/intel/Kconfig" +source "drivers/net/ethernet/i825xx/Kconfig" source "drivers/net/ethernet/qlogic/Kconfig" source "drivers/net/ethernet/smsc/Kconfig" diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 983fd2752151..6d3276a48012 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -8,5 +8,6 @@ obj-$(CONFIG_NET_VENDOR_AMD) += amd/ obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/ obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/ obj-$(CONFIG_NET_VENDOR_INTEL) += intel/ +obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/ obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/ obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/ diff --git a/drivers/net/3c505.c b/drivers/net/ethernet/i825xx/3c505.c similarity index 100% rename from drivers/net/3c505.c rename to drivers/net/ethernet/i825xx/3c505.c diff --git a/drivers/net/3c505.h b/drivers/net/ethernet/i825xx/3c505.h similarity index 100% rename from drivers/net/3c505.h rename to drivers/net/ethernet/i825xx/3c505.h diff --git a/drivers/net/3c507.c b/drivers/net/ethernet/i825xx/3c507.c similarity index 100% rename from drivers/net/3c507.c rename to drivers/net/ethernet/i825xx/3c507.c diff --git a/drivers/net/3c523.c b/drivers/net/ethernet/i825xx/3c523.c similarity index 100% rename from drivers/net/3c523.c rename to drivers/net/ethernet/i825xx/3c523.c diff --git a/drivers/net/3c523.h b/drivers/net/ethernet/i825xx/3c523.h similarity index 100% rename from drivers/net/3c523.h rename to drivers/net/ethernet/i825xx/3c523.h diff --git a/drivers/net/3c527.c b/drivers/net/ethernet/i825xx/3c527.c similarity index 100% rename from drivers/net/3c527.c rename to drivers/net/ethernet/i825xx/3c527.c diff --git a/drivers/net/3c527.h b/drivers/net/ethernet/i825xx/3c527.h similarity index 100% rename from drivers/net/3c527.h rename to drivers/net/ethernet/i825xx/3c527.h diff --git a/drivers/net/82596.c b/drivers/net/ethernet/i825xx/82596.c similarity index 100% rename from drivers/net/82596.c rename to drivers/net/ethernet/i825xx/82596.c diff --git a/drivers/net/ethernet/i825xx/Kconfig b/drivers/net/ethernet/i825xx/Kconfig new file mode 100644 index 000000000000..5c30a5b3cba9 --- /dev/null +++ b/drivers/net/ethernet/i825xx/Kconfig @@ -0,0 +1,182 @@ +# +# Intel 82596/82593/82596 network device configuration +# + +config NET_VENDOR_I825XX + bool "Intel (82586/82593/82596) devices" + depends on NET_VENDOR_INTEL && (ISA || ISA_DMA_API || ARM || \ + ARCH_ACORN || MCA || MCA_LEGACY || SNI_RM || SUN3 || \ + GSC || BVME6000 || MVME16x || EXPERIMENTAL) + ---help--- + If you have a network (Ethernet) card belonging to this class, say Y + and read the Ethernet-HOWTO, available from + . + + Note that the answer to this question does not directly affect the + kernel: saying N will just cause the configurator to skip all + the questions about these devices. If you say Y, you will be asked for + your specific card in the following questions. + +if NET_VENDOR_I825XX + +config ELPLUS + tristate "3c505 \"EtherLink Plus\" support" + depends on ISA && ISA_DMA_API + ---help--- + Information about this network (Ethernet) card can be found in + . If you have a card of + this type, say Y and read the Ethernet-HOWTO, available from + . + + 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 ISA && EXPERIMENTAL + ---help--- + If you have a network (Ethernet) card of this type, say Y and read + the Ethernet-HOWTO, available from + . + + To compile this driver as a module, choose M here. The module + will be called 3c507. + +config ELMC + tristate "3c523 \"EtherLink/MC\" support" + depends on MCA_LEGACY + ---help--- + If you have a network (Ethernet) card of this type, say Y and read + the Ethernet-HOWTO, available from + . + + 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 MCA && MCA_LEGACY + ---help--- + If you have a network (Ethernet) card of this type, say Y and read + the Ethernet-HOWTO, available from + . + + To compile this driver as a module, choose M here. The module + will be called 3c527. + +config ARM_ETHER1 + tristate "Acorn Ether1 support" + depends on ARM && ARCH_ACORN + ---help--- + If you have an Acorn system with one of these (AKA25) network cards, + you should say Y to this option if you wish to use it with Linux. + +config APRICOT + tristate "Apricot Xen-II on board Ethernet" + depends on ISA + ---help--- + If you have a network (Ethernet) controller of this type, say Y and + read the Ethernet-HOWTO, available from + . + + To compile this driver as a module, choose M here. The module + will be called apricot. + +config BVME6000_NET + tristate "BVME6000 Ethernet support" + depends on BVME6000MVME16x + ---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 EEXPRESS + tristate "EtherExpress 16 support" + depends on ISA + ---help--- + If you have an EtherExpress16 network (Ethernet) card, say Y and + read the Ethernet-HOWTO, available from + . 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 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 + . + + To compile this driver as a module, choose M here. The module + will be called eepro. + +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 LP486E + tristate "LP486E on board Ethernet" + 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 + Intel Professional Workstation. + +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 NI52 + tristate "NI5210 support" + depends on ISA + ---help--- + If you have a network (Ethernet) card of this type, say Y and read + the Ethernet-HOWTO, available from + . + + To compile this driver as a module, choose M here. The module + will be called ni52. + +config SNI_82596 + tristate "SNI RM ethernet" + depends on SNI_RM + ---help--- + Say Y here to support the on-board Intel 82596 ethernet controller + built into SNI RM machines. + +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 ZNET + tristate "Zenith Z-Note support (EXPERIMENTAL)" + depends on 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 + . + +endif # NET_VENDOR_I825XX diff --git a/drivers/net/ethernet/i825xx/Makefile b/drivers/net/ethernet/i825xx/Makefile new file mode 100644 index 000000000000..f68a3694968a --- /dev/null +++ b/drivers/net/ethernet/i825xx/Makefile @@ -0,0 +1,20 @@ +# +# Makefile for the Intel 82586/82593/82596 chipset device drivers. +# + +obj-$(CONFIG_ARM_ETHER1) += ether1.o +obj-$(CONFIG_EEXPRESS) += eexpress.o +obj-$(CONFIG_EEXPRESS_PRO) += eepro.o +obj-$(CONFIG_ELPLUS) += 3c505.o +obj-$(CONFIG_EL16) += 3c507.o +obj-$(CONFIG_ELMC) += 3c523.o +obj-$(CONFIG_ELMC_II) += 3c527.o +obj-$(CONFIG_LP486E) += lp486e.o +obj-$(CONFIG_NI52) += ni52.o +obj-$(CONFIG_SUN3_82586) += sun3_82586.o +obj-$(CONFIG_ZNET) += znet.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 diff --git a/drivers/net/eepro.c b/drivers/net/ethernet/i825xx/eepro.c similarity index 100% rename from drivers/net/eepro.c rename to drivers/net/ethernet/i825xx/eepro.c diff --git a/drivers/net/eexpress.c b/drivers/net/ethernet/i825xx/eexpress.c similarity index 100% rename from drivers/net/eexpress.c rename to drivers/net/ethernet/i825xx/eexpress.c diff --git a/drivers/net/eexpress.h b/drivers/net/ethernet/i825xx/eexpress.h similarity index 100% rename from drivers/net/eexpress.h rename to drivers/net/ethernet/i825xx/eexpress.h diff --git a/drivers/net/arm/ether1.c b/drivers/net/ethernet/i825xx/ether1.c similarity index 100% rename from drivers/net/arm/ether1.c rename to drivers/net/ethernet/i825xx/ether1.c diff --git a/drivers/net/arm/ether1.h b/drivers/net/ethernet/i825xx/ether1.h similarity index 100% rename from drivers/net/arm/ether1.h rename to drivers/net/ethernet/i825xx/ether1.h diff --git a/drivers/net/lasi_82596.c b/drivers/net/ethernet/i825xx/lasi_82596.c similarity index 100% rename from drivers/net/lasi_82596.c rename to drivers/net/ethernet/i825xx/lasi_82596.c diff --git a/drivers/net/lib82596.c b/drivers/net/ethernet/i825xx/lib82596.c similarity index 100% rename from drivers/net/lib82596.c rename to drivers/net/ethernet/i825xx/lib82596.c diff --git a/drivers/net/lp486e.c b/drivers/net/ethernet/i825xx/lp486e.c similarity index 100% rename from drivers/net/lp486e.c rename to drivers/net/ethernet/i825xx/lp486e.c diff --git a/drivers/net/ni52.c b/drivers/net/ethernet/i825xx/ni52.c similarity index 100% rename from drivers/net/ni52.c rename to drivers/net/ethernet/i825xx/ni52.c diff --git a/drivers/net/ni52.h b/drivers/net/ethernet/i825xx/ni52.h similarity index 100% rename from drivers/net/ni52.h rename to drivers/net/ethernet/i825xx/ni52.h diff --git a/drivers/net/sni_82596.c b/drivers/net/ethernet/i825xx/sni_82596.c similarity index 100% rename from drivers/net/sni_82596.c rename to drivers/net/ethernet/i825xx/sni_82596.c diff --git a/drivers/net/sun3_82586.c b/drivers/net/ethernet/i825xx/sun3_82586.c similarity index 100% rename from drivers/net/sun3_82586.c rename to drivers/net/ethernet/i825xx/sun3_82586.c diff --git a/drivers/net/sun3_82586.h b/drivers/net/ethernet/i825xx/sun3_82586.h similarity index 100% rename from drivers/net/sun3_82586.h rename to drivers/net/ethernet/i825xx/sun3_82586.h diff --git a/drivers/net/znet.c b/drivers/net/ethernet/i825xx/znet.c similarity index 100% rename from drivers/net/znet.c rename to drivers/net/ethernet/i825xx/znet.c