diff options
| -rw-r--r-- | MAINTAINERS | 1 | ||||
| -rw-r--r-- | drivers/net/Kconfig | 32 | ||||
| -rw-r--r-- | drivers/net/Makefile | 2 | ||||
| -rw-r--r-- | drivers/net/hippi/Kconfig | 39 | ||||
| -rw-r--r-- | drivers/net/hippi/Makefile | 5 | ||||
| -rw-r--r-- | drivers/net/hippi/rrunner.c (renamed from drivers/net/rrunner.c) | 0 | ||||
| -rw-r--r-- | drivers/net/hippi/rrunner.h (renamed from drivers/net/rrunner.h) | 0 |
7 files changed, 46 insertions, 33 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c5ec925fc9c7..194095ac07ec 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3049,6 +3049,7 @@ S: Maintained F: include/linux/hippidevice.h F: include/linux/if_hippi.h F: net/802/hippi.c +F: drivers/net/hippi/ HOST AP DRIVER M: Jouni Malinen <j@w1.fi> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index c5e2a3871dc5..1d8fa955d120 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -272,38 +272,6 @@ config RIONET_RX_SIZE depends on RIONET default "128" -config HIPPI - bool "HIPPI driver support (EXPERIMENTAL)" - depends on EXPERIMENTAL && INET && PCI - help - HIgh Performance Parallel Interface (HIPPI) is a 800Mbit/sec and - 1600Mbit/sec dual-simplex switched or point-to-point network. HIPPI - can run over copper (25m) or fiber (300m on multi-mode or 10km on - single-mode). HIPPI networks are commonly used for clusters and to - connect to super computers. If you are connected to a HIPPI network - and have a HIPPI network card in your computer that you want to use - under Linux, say Y here (you must also remember to enable the driver - for your HIPPI card below). Most people will say N here. - -config ROADRUNNER - tristate "Essential RoadRunner HIPPI PCI adapter support (EXPERIMENTAL)" - depends on HIPPI && PCI - help - Say Y here if this is your PCI HIPPI network card. - - To compile this driver as a module, choose M here: the module - will be called rrunner. If unsure, say N. - -config ROADRUNNER_LARGE_RINGS - bool "Use large TX/RX rings (EXPERIMENTAL)" - depends on ROADRUNNER - help - If you say Y here, the RoadRunner driver will preallocate up to 2 MB - of additional memory to allow for fastest operation, both for - transmitting and receiving. This memory cannot be used by any other - kernel code or by user space programs. Say Y here only if you have - the memory. - config PLIP tristate "PLIP (parallel port) support" depends on PARPORT diff --git a/drivers/net/Makefile b/drivers/net/Makefile index a397f1e43ef1..f64d02ce1ed9 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -13,7 +13,6 @@ obj-$(CONFIG_VMXNET3) += vmxnet3/ # link order important here # obj-$(CONFIG_PLIP) += plip.o -obj-$(CONFIG_ROADRUNNER) += rrunner.o obj-$(CONFIG_RIONET) += rionet.o # @@ -39,6 +38,7 @@ obj-$(CONFIG_VETH) += veth.o obj-$(CONFIG_DEV_APPLETALK) += appletalk/ obj-$(CONFIG_ETHERNET) += ethernet/ obj-$(CONFIG_FDDI) += fddi/ +obj-$(CONFIG_HIPPI) += hippi/ onj-$(CONFIG_PPP) += ppp/ obj-$(CONFIG_PPP_ASYNC) += ppp/ obj-$(CONFIG_PPP_BSDCOMP) += ppp/ diff --git a/drivers/net/hippi/Kconfig b/drivers/net/hippi/Kconfig new file mode 100644 index 000000000000..7393eb732ee6 --- /dev/null +++ b/drivers/net/hippi/Kconfig @@ -0,0 +1,39 @@ +# +# HIPPI network device configuration +# + +config HIPPI + bool "HIPPI driver support (EXPERIMENTAL)" + depends on EXPERIMENTAL && INET && PCI + ---help--- + HIgh Performance Parallel Interface (HIPPI) is a 800Mbit/sec and + 1600Mbit/sec dual-simplex switched or point-to-point network. HIPPI + can run over copper (25m) or fiber (300m on multi-mode or 10km on + single-mode). HIPPI networks are commonly used for clusters and to + connect to super computers. If you are connected to a HIPPI network + and have a HIPPI network card in your computer that you want to use + under Linux, say Y here (you must also remember to enable the driver + for your HIPPI card below). Most people will say N here. + +if HIPPI + +config ROADRUNNER + tristate "Essential RoadRunner HIPPI PCI adapter support (EXPERIMENTAL)" + depends on PCI + ---help--- + Say Y here if this is your PCI HIPPI network card. + + To compile this driver as a module, choose M here: the module + will be called rrunner. If unsure, say N. + +config ROADRUNNER_LARGE_RINGS + bool "Use large TX/RX rings (EXPERIMENTAL)" + depends on ROADRUNNER + ---help--- + If you say Y here, the RoadRunner driver will preallocate up to 2 MB + of additional memory to allow for fastest operation, both for + transmitting and receiving. This memory cannot be used by any other + kernel code or by user space programs. Say Y here only if you have + the memory. + +endif /* HIPPI */ diff --git a/drivers/net/hippi/Makefile b/drivers/net/hippi/Makefile new file mode 100644 index 000000000000..b95d629baee5 --- /dev/null +++ b/drivers/net/hippi/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for the HIPPI network device drivers. +# + +obj-$(CONFIG_ROADRUNNER) += rrunner.o diff --git a/drivers/net/rrunner.c b/drivers/net/hippi/rrunner.c index e68c941926f1..e68c941926f1 100644 --- a/drivers/net/rrunner.c +++ b/drivers/net/hippi/rrunner.c diff --git a/drivers/net/rrunner.h b/drivers/net/hippi/rrunner.h index 28169043ae49..28169043ae49 100644 --- a/drivers/net/rrunner.h +++ b/drivers/net/hippi/rrunner.h |