Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33f810b2 authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

fddi: Move the FDDI drivers 



Move the FDDI drivers into drivers/net/fddi/ and make the
necessary Kconfig and Makefile changes.

CC: "Maciej W. Rozycki" <macro@linux-mips.org>
CC: Christoph Goos <cgoos@syskonnect.de>
CC: <linux@syskonnect.de>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 3cd0999d

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -2113,7 +2113,7 @@ F: net/decnet/ 
DEFXX FDDI NETWORK DRIVER

M:	"Maciej W. Rozycki" <macro@linux-mips.org>

S:	Maintained

F:	drivers/net/defxx.*

F:	drivers/net/fddi/defxx.*



DELL LAPTOP DRIVER

M:	Matthew Garrett <mjg59@srcf.ucam.org>

drivers/net/Kconfig

+2 −70
Original line number Diff line number Diff line
@@ -195,6 +195,8 @@ config SUNGEM_PHY 


source "drivers/net/ethernet/Kconfig"



source "drivers/net/fddi/Kconfig"



source "drivers/net/tokenring/Kconfig"



source "drivers/net/wireless/Kconfig"
@@ -268,76 +270,6 @@ config RIONET_RX_SIZE 
	depends on RIONET

	default "128"



config FDDI

	tristate "FDDI driver support"

	depends on (PCI || EISA || TC)

	help

	  Fiber Distributed Data Interface is a high speed local area network

	  design; essentially a replacement for high speed Ethernet. FDDI can

	  run over copper or fiber. If you are connected to such a network and

	  want a driver for the FDDI card in your computer, say Y here (and

	  then also Y to the driver for your FDDI card, below). Most people

	  will say N.



config DEFXX

	tristate "Digital DEFTA/DEFEA/DEFPA adapter support"

	depends on FDDI && (PCI || EISA || TC)

	---help---

	  This is support for the DIGITAL series of TURBOchannel (DEFTA),

	  EISA (DEFEA) and PCI (DEFPA) controllers which can connect you

	  to a local FDDI network.



	  To compile this driver as a module, choose M here: the module

	  will be called defxx.  If unsure, say N.



config DEFXX_MMIO

	bool

	prompt "Use MMIO instead of PIO" if PCI || EISA

	depends on DEFXX

	default n if PCI || EISA

	default y

	---help---

	  This instructs the driver to use EISA or PCI memory-mapped I/O

	  (MMIO) as appropriate instead of programmed I/O ports (PIO).

	  Enabling this gives an improvement in processing time in parts

	  of the driver, but it may cause problems with EISA (DEFEA)

	  adapters.  TURBOchannel does not have the concept of I/O ports,

	  so MMIO is always used for these (DEFTA) adapters.



	  If unsure, say N.



config SKFP

	tristate "SysKonnect FDDI PCI support"

	depends on FDDI && PCI

	select BITREVERSE

	---help---

	  Say Y here if you have a SysKonnect FDDI PCI adapter.

	  The following adapters are supported by this driver:

	  - SK-5521 (SK-NET FDDI-UP)

	  - SK-5522 (SK-NET FDDI-UP DAS)

	  - SK-5541 (SK-NET FDDI-FP)

	  - SK-5543 (SK-NET FDDI-LP)

	  - SK-5544 (SK-NET FDDI-LP DAS)

	  - SK-5821 (SK-NET FDDI-UP64)

	  - SK-5822 (SK-NET FDDI-UP64 DAS)

	  - SK-5841 (SK-NET FDDI-FP64)

	  - SK-5843 (SK-NET FDDI-LP64)

	  - SK-5844 (SK-NET FDDI-LP64 DAS)

	  - Netelligent 100 FDDI DAS Fibre SC

	  - Netelligent 100 FDDI SAS Fibre SC

	  - Netelligent 100 FDDI DAS UTP

	  - Netelligent 100 FDDI SAS UTP

	  - Netelligent 100 FDDI SAS Fibre MIC



	  Read <file:Documentation/networking/skfp.txt> for information about

	  the driver.



	  Questions concerning this driver can be addressed to:

	  <linux@syskonnect.de>



	  To compile this driver as a module, choose M here: the module

	  will be called skfp.  This is recommended.



config HIPPI

	bool "HIPPI driver support (EXPERIMENTAL)"

	depends on EXPERIMENTAL && INET && PCI

drivers/net/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ obj-$(CONFIG_VMXNET3) += vmxnet3/ 
#

obj-$(CONFIG_PLIP) += plip.o

obj-$(CONFIG_ROADRUNNER) += rrunner.o

obj-$(CONFIG_SKFP) += skfp/

obj-$(CONFIG_RIONET) += rionet.o



#
@@ -42,13 +41,13 @@ obj-$(CONFIG_DUMMY) += dummy.o 
obj-$(CONFIG_IFB) += ifb.o

obj-$(CONFIG_MACVLAN) += macvlan.o

obj-$(CONFIG_MACVTAP) += macvtap.o

obj-$(CONFIG_DEFXX) += defxx.o

obj-$(CONFIG_EQUALIZER) += eql.o

obj-$(CONFIG_TUN) += tun.o

obj-$(CONFIG_VETH) += veth.o



obj-$(CONFIG_DEV_APPLETALK) += appletalk/

obj-$(CONFIG_ETHERNET) += ethernet/

obj-$(CONFIG_FDDI) += fddi/

obj-$(CONFIG_TR) += tokenring/

obj-$(CONFIG_WAN) += wan/

obj-$(CONFIG_ARCNET) += arcnet/

drivers/net/fddi/Kconfig

0 → 100644
+77 −0
Original line number Diff line number Diff line 
#

# FDDI network device configuration

#



config FDDI

	tristate "FDDI driver support"

	depends on PCI || EISA || TC

	---help---

	  Fiber Distributed Data Interface is a high speed local area network

	  design; essentially a replacement for high speed Ethernet. FDDI can

	  run over copper or fiber. If you are connected to such a network and

	  want a driver for the FDDI card in your computer, say Y here (and

	  then also Y to the driver for your FDDI card, below). Most people

	  will say N.



if FDDI



config DEFXX

	tristate "Digital DEFTA/DEFEA/DEFPA adapter support"

	depends on FDDI && (PCI || EISA || TC)

	---help---

	  This is support for the DIGITAL series of TURBOchannel (DEFTA),

	  EISA (DEFEA) and PCI (DEFPA) controllers which can connect you

	  to a local FDDI network.



	  To compile this driver as a module, choose M here: the module

	  will be called defxx.  If unsure, say N.



config DEFXX_MMIO

	bool

	prompt "Use MMIO instead of PIO" if PCI || EISA

	depends on DEFXX

	default n if PCI || EISA

	default y

	---help---

	  This instructs the driver to use EISA or PCI memory-mapped I/O

	  (MMIO) as appropriate instead of programmed I/O ports (PIO).

	  Enabling this gives an improvement in processing time in parts

	  of the driver, but it may cause problems with EISA (DEFEA)

	  adapters.  TURBOchannel does not have the concept of I/O ports,

	  so MMIO is always used for these (DEFTA) adapters.



	  If unsure, say N.



config SKFP

	tristate "SysKonnect FDDI PCI support"

	depends on FDDI && PCI

	select BITREVERSE

	---help---

	  Say Y here if you have a SysKonnect FDDI PCI adapter.

	  The following adapters are supported by this driver:

	  - SK-5521 (SK-NET FDDI-UP)

	  - SK-5522 (SK-NET FDDI-UP DAS)

	  - SK-5541 (SK-NET FDDI-FP)

	  - SK-5543 (SK-NET FDDI-LP)

	  - SK-5544 (SK-NET FDDI-LP DAS)

	  - SK-5821 (SK-NET FDDI-UP64)

	  - SK-5822 (SK-NET FDDI-UP64 DAS)

	  - SK-5841 (SK-NET FDDI-FP64)

	  - SK-5843 (SK-NET FDDI-LP64)

	  - SK-5844 (SK-NET FDDI-LP64 DAS)

	  - Netelligent 100 FDDI DAS Fibre SC

	  - Netelligent 100 FDDI SAS Fibre SC

	  - Netelligent 100 FDDI DAS UTP

	  - Netelligent 100 FDDI SAS UTP

	  - Netelligent 100 FDDI SAS Fibre MIC



	  Read <file:Documentation/networking/skfp.txt> for information about

	  the driver.



	  Questions concerning this driver can be addressed to:

	  <linux@syskonnect.de>



	  To compile this driver as a module, choose M here: the module

	  will be called skfp.  This is recommended.



endif # FDDI

drivers/net/fddi/Makefile

0 → 100644
+6 −0
Original line number Diff line number Diff line 
#

# Makefile for the Linux FDDI network device drivers.

#



obj-$(CONFIG_DEFXX) += defxx.o

obj-$(CONFIG_SKFP) += skfp/