Commit ff5a3b50 authored by Jeff Kirsher's avatar Jeff Kirsher

hippi: Move the HIPPI driver

Move the HIPPI driver into drivers/net/hippi/ and make the
necessary Kconfig and Makefile changes.

CC: Jes Sorensen <jes@wildopensource.com>
CC: Jes Sorensen <jes@trained-monkey.org>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 224cf5ad
...@@ -3049,6 +3049,7 @@ S: Maintained ...@@ -3049,6 +3049,7 @@ S: Maintained
F: include/linux/hippidevice.h F: include/linux/hippidevice.h
F: include/linux/if_hippi.h F: include/linux/if_hippi.h
F: net/802/hippi.c F: net/802/hippi.c
F: drivers/net/hippi/
HOST AP DRIVER HOST AP DRIVER
M: Jouni Malinen <j@w1.fi> M: Jouni Malinen <j@w1.fi>
......
...@@ -272,38 +272,6 @@ config RIONET_RX_SIZE ...@@ -272,38 +272,6 @@ config RIONET_RX_SIZE
depends on RIONET depends on RIONET
default "128" 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 config PLIP
tristate "PLIP (parallel port) support" tristate "PLIP (parallel port) support"
depends on PARPORT depends on PARPORT
......
...@@ -13,7 +13,6 @@ obj-$(CONFIG_VMXNET3) += vmxnet3/ ...@@ -13,7 +13,6 @@ obj-$(CONFIG_VMXNET3) += vmxnet3/
# link order important here # link order important here
# #
obj-$(CONFIG_PLIP) += plip.o obj-$(CONFIG_PLIP) += plip.o
obj-$(CONFIG_ROADRUNNER) += rrunner.o
obj-$(CONFIG_RIONET) += rionet.o obj-$(CONFIG_RIONET) += rionet.o
# #
...@@ -39,6 +38,7 @@ obj-$(CONFIG_VETH) += veth.o ...@@ -39,6 +38,7 @@ obj-$(CONFIG_VETH) += veth.o
obj-$(CONFIG_DEV_APPLETALK) += appletalk/ obj-$(CONFIG_DEV_APPLETALK) += appletalk/
obj-$(CONFIG_ETHERNET) += ethernet/ obj-$(CONFIG_ETHERNET) += ethernet/
obj-$(CONFIG_FDDI) += fddi/ obj-$(CONFIG_FDDI) += fddi/
obj-$(CONFIG_HIPPI) += hippi/
onj-$(CONFIG_PPP) += ppp/ onj-$(CONFIG_PPP) += ppp/
obj-$(CONFIG_PPP_ASYNC) += ppp/ obj-$(CONFIG_PPP_ASYNC) += ppp/
obj-$(CONFIG_PPP_BSDCOMP) += ppp/ obj-$(CONFIG_PPP_BSDCOMP) += ppp/
......
#
# 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 */
#
# Makefile for the HIPPI network device drivers.
#
obj-$(CONFIG_ROADRUNNER) += rrunner.o
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment