luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

3c*/acenic/typhoon: Move 3Com Ethernet drivers

Browse Source 
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 <klassert@mathematik.tu-chemnitz.de>
CC: David Dillow <dave@thedillows.org>
CC: Jes Sorensen <jes@trained-monkey.org>
CC: Alan Cox <alan@linux.intel.com>
CC: David Hinds <dahinds@users.sourceforge.net>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: David Dillow <dave@thedillows.org>
This commit is contained in:
Jeff Kirsher 2011-03-30 03:47:06 -07:00
parent c1abc95b15
commit ca7a8e8526
20 changed files with 176 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MAINTAINERS
View File

@ -124,13 +124,13 @@ M: Steffen Klassert <klassert@mathematik.tu-chemnitz.de>
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 <dave@thedillows.org>
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 <linuxraid@lsi.com>
@ -214,7 +214,7 @@ ACENIC DRIVER
M: Jes Sorensen <jes@trained-monkey.org>
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 <peter@piie.net>

138
drivers/net/Kconfig
View File

@ -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
<http://www.tldp.org/docs.html#howto>.
Note that the answer to this question doesn't directly affect the
kernel: saying N will just cause the configurator to skip all
the questions about 3COM cards. If you say Y, you will be asked for
your specific card in the following questions.
config EL1
tristate "3c501 \"EtherLink\" support"
depends on NET_VENDOR_3COM && ISA
---help---
If you have a network (Ethernet) card of this type, say Y and read
the Ethernet-HOWTO, available from
<http://www.tldp.org/docs.html#howto>. Also, consider buying a
new card, since the 3c501 is slow, broken, and obsolete: you will
have problems. Some people suggest to ping ("man ping") a nearby
machine every minute ("man cron") when using this card.
To compile this driver as a module, choose M here. The module
will be called 3c501.
config EL2
tristate "3c503 \"EtherLink II\" support"
depends on NET_VENDOR_3COM && ISA
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
<http://www.tldp.org/docs.html#howto>.
@ -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
<file:Documentation/networking/3c505.txt>. 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
<http://www.tldp.org/docs.html#howto>.
@ -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 <http://www.tldp.org/docs.html#howto>.
If your card is not working you may need to use the DOS
setup disk to disable Plug & Play mode, and to select the default
media type.
To compile this driver as a module, choose M here. The module
will be called 3c509.
config 3C515
tristate "3c515 ISA \"Fast EtherLink\""
depends on NET_VENDOR_3COM && (ISA || EISA) && ISA_DMA_API
help
If you have a 3Com ISA EtherLink XL "Corkscrew" 3c515 Fast Ethernet
network card, say Y and read the Ethernet-HOWTO, available from
<http://www.tldp.org/docs.html#howto>.
To compile this driver as a module, choose M here. The module
will be called 3c515.
config 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
<http://www.tldp.org/docs.html#howto>.
@ -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
<http://www.tldp.org/docs.html#howto>.
@ -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 <http://www.tldp.org/docs.html#howto>. More
specific information is in
<file:Documentation/networking/vortex.txt> and in the comments at
the beginning of <file:drivers/net/3c59x.c>.
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
<http://www.tldp.org/docs.html#howto>.
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

7
drivers/net/Makefile
View File

@ -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/

0
drivers/net/3c501.c → drivers/net/ethernet/3com/3c501.c
View File

0
drivers/net/3c501.h → drivers/net/ethernet/3com/3c501.h
View File

0
drivers/net/3c509.c → drivers/net/ethernet/3com/3c509.c
View File

0
drivers/net/3c515.c → drivers/net/ethernet/3com/3c515.c
View File

0
drivers/net/pcmcia/3c574_cs.c → drivers/net/ethernet/3com/3c574_cs.c
View File

0
drivers/net/pcmcia/3c589_cs.c → drivers/net/ethernet/3com/3c589_cs.c
View File

0
drivers/net/3c59x.c → drivers/net/ethernet/3com/3c59x.c
View File

147
drivers/net/ethernet/3com/Kconfig Normal file
View File

@ -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
<http://www.tldp.org/docs.html#howto>.
Note that the answer to this question doesn't directly affect the
kernel: saying N will just cause the configurator to skip all
the questions about 3Com cards. If you say Y, you will be asked for
your specific card in the following questions.
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
<http://www.tldp.org/docs.html#howto>. Also, consider buying a
new card, since the 3c501 is slow, broken, and obsolete: you will
have problems. Some people suggest to ping ("man ping") a nearby
machine every minute ("man cron") when using this card.
To compile this driver as a module, choose M here. The module
will be called 3c501.
config 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 <http://www.tldp.org/docs.html#howto>.
If your card is not working you may need to use the DOS
setup disk to disable Plug & Play mode, and to select the default
media type.
To compile this driver as a module, choose M here. The module
will be called 3c509.
config 3C515
tristate "3c515 ISA \"Fast EtherLink\""
depends on (ISA || EISA) && ISA_DMA_API
---help---
If you have a 3Com ISA EtherLink XL "Corkscrew" 3c515 Fast Ethernet
network card, say Y and read the Ethernet-HOWTO, available from
<http://www.tldp.org/docs.html#howto>.
To compile this driver as a module, choose M here. The module
will be called 3c515.
config 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 <http://www.tldp.org/docs.html#howto>. More
specific information is in
<file:Documentation/networking/vortex.txt> and in the comments at
the beginning of <file:drivers/net/3c59x.c>.
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
<http://www.tldp.org/docs.html#howto>.
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

12
drivers/net/ethernet/3com/Makefile Normal file
View File

@ -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

0
drivers/net/acenic.c → drivers/net/ethernet/3com/acenic.c
View File

0
drivers/net/acenic.h → drivers/net/ethernet/3com/acenic.h
View File

0
drivers/net/typhoon.c → drivers/net/ethernet/3com/typhoon.c
View File

0
drivers/net/typhoon.h → drivers/net/ethernet/3com/typhoon.h
View File

2
drivers/net/ethernet/Kconfig
View File

@ -11,4 +11,6 @@ menuconfig ETHERNET
if ETHERNET
source "drivers/net/ethernet/3com/Kconfig"
endif # ETHERNET

2
drivers/net/ethernet/Makefile
View File

@ -1,3 +1,5 @@
#
# Makefile for the Linux network Ethernet device drivers.
#
obj-$(CONFIG_NET_VENDOR_3COM) += 3com/

18
drivers/net/pcmcia/Kconfig
View File

@ -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

2
drivers/net/pcmcia/Makefile
View File

@ -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