Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-15 00:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/next-organize

Browse Source
This commit is contained in:
David S. Miller 2011-08-27 12:14:34 -04:00
commit 95148229d3
128 changed files with 738 additions and 647 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
MAINTAINERS
View File

@ -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>
@ -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>
@ -5066,7 +5067,7 @@ PPP PROTOCOL DRIVERS AND COMPRESSORS
M: Paul Mackerras <paulus@samba.org>
L: linux-ppp@vger.kernel.org
S: Maintained
F: drivers/net/ppp_*
F: drivers/net/ppp/ppp_*
PPP OVER ATM (RFC 2364)
M: Mitchell Blank Jr <mitch@sfgoth.com>
@ -5077,8 +5078,8 @@ F: include/linux/atmppp.h
PPP OVER ETHERNET
M: Michal Ostrowski <mostrows@earthlink.net>
S: Maintained
F: drivers/net/pppoe.c
F: drivers/net/pppox.c
F: drivers/net/ppp/pppoe.c
F: drivers/net/ppp/pppox.c
PPP OVER L2TP
M: James Chapman <jchapman@katalix.com>
@ -5099,7 +5100,7 @@ PPTP DRIVER
M: Dmitry Kozlov <xeb@mail.ru>
L: netdev@vger.kernel.org
S: Maintained
F: drivers/net/pptp.c
F: drivers/net/ppp/pptp.c
W: http://sourceforge.net/projects/accel-pptp
PREEMPTIBLE KERNEL

642
drivers/net/Kconfig
View File

@ -25,18 +25,32 @@ menuconfig NETDEVICES
# that for each of the symbols.
if NETDEVICES
config IFB
tristate "Intermediate Functional Block support"
depends on NET_CLS_ACT
config NET_CORE
default y
bool "Network core driver support"
---help---
This is an intermediate driver that allows sharing of
resources.
You can say N here if you do not intend to use any of the
networking core drivers (i.e. VLAN, bridging, bonding, etc.)
if NET_CORE
config BONDING
tristate "Bonding driver support"
depends on INET
depends on IPV6 || IPV6=n
---help---
Say 'Y' or 'M' if you wish to be able to 'bond' multiple Ethernet
Channels together. This is called 'Etherchannel' by Cisco,
'Trunking' by Sun, 802.3ad by the IEEE, and 'Bonding' in Linux.
The driver supports multiple bonding modes to allow for both high
performance and high availability operation.
Refer to <file:Documentation/networking/bonding.txt> for more
information.
To compile this driver as a module, choose M here: the module
will be called ifb. If you want to use more than one ifb
device at a time, you need to compile this driver as a module.
Instead of 'ifb', the devices will then be called 'ifb0',
'ifb1' etc.
Look at the iproute2 documentation directory for usage etc
will be called bonding.
config DUMMY
tristate "Dummy net driver support"
@ -57,23 +71,59 @@ config DUMMY
Instead of 'dummy', the devices will then be called 'dummy0',
'dummy1' etc.
config BONDING
tristate "Bonding driver support"
depends on INET
depends on IPV6 || IPV6=n
config EQUALIZER
tristate "EQL (serial line load balancing) support"
---help---
Say 'Y' or 'M' if you wish to be able to 'bond' multiple Ethernet
Channels together. This is called 'Etherchannel' by Cisco,
'Trunking' by Sun, 802.3ad by the IEEE, and 'Bonding' in Linux.
If you have two serial connections to some other computer (this
usually requires two modems and two telephone lines) and you use
SLIP (the protocol for sending Internet traffic over telephone
lines) or PPP (a better SLIP) on them, you can make them behave like
one double speed connection using this driver. Naturally, this has
to be supported at the other end as well, either with a similar EQL
Linux driver or with a Livingston Portmaster 2e.
The driver supports multiple bonding modes to allow for both high
performance and high availability operation.
Refer to <file:Documentation/networking/bonding.txt> for more
information.
Say Y if you want this and read
<file:Documentation/networking/eql.txt>. You may also want to read
section 6.2 of the NET-3-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 bonding.
will be called eql. If unsure, say N.
config NET_FC
bool "Fibre Channel driver support"
depends on SCSI && PCI
help
Fibre Channel is a high speed serial protocol mainly used to connect
large storage devices to the computer; it is compatible with and
intended to replace SCSI.
If you intend to use Fibre Channel, you need to have a Fibre channel
adaptor card in your computer; say Y here and to the driver for your
adaptor below. You also should have said Y to "SCSI support" and
"SCSI generic support".
config MII
tristate "Generic Media Independent Interface device support"
help
Most ethernet controllers have MII transceiver either as an external
or internal device. It is safe to say Y or M here even if your
ethernet card lacks MII.
source "drivers/ieee802154/Kconfig"
config IFB
tristate "Intermediate Functional Block support"
depends on NET_CLS_ACT
---help---
This is an intermediate driver that allows sharing of
resources.
To compile this driver as a module, choose M here: the module
will be called ifb. If you want to use more than one ifb
device at a time, you need to compile this driver as a module.
Instead of 'ifb', the devices will then be called 'ifb0',
'ifb1' etc.
Look at the iproute2 documentation directory for usage etc
config MACVLAN
tristate "MAC-VLAN support (EXPERIMENTAL)"
@ -102,24 +152,46 @@ config MACVTAP
To compile this driver as a module, choose M here: the module
will be called macvtap.
config EQUALIZER
tristate "EQL (serial line load balancing) support"
config NETCONSOLE
tristate "Network console logging support"
---help---
If you have two serial connections to some other computer (this
usually requires two modems and two telephone lines) and you use
SLIP (the protocol for sending Internet traffic over telephone
lines) or PPP (a better SLIP) on them, you can make them behave like
one double speed connection using this driver. Naturally, this has
to be supported at the other end as well, either with a similar EQL
Linux driver or with a Livingston Portmaster 2e.
If you want to log kernel messages over the network, enable this.
See <file:Documentation/networking/netconsole.txt> for details.
Say Y if you want this and read
<file:Documentation/networking/eql.txt>. You may also want to read
section 6.2 of the NET-3-HOWTO, available from
<http://www.tldp.org/docs.html#howto>.
config NETCONSOLE_DYNAMIC
bool "Dynamic reconfiguration of logging targets"
depends on NETCONSOLE && SYSFS && CONFIGFS_FS && \
!(NETCONSOLE=y && CONFIGFS_FS=m)
help
This option enables the ability to dynamically reconfigure target
parameters (interface, IP addresses, port numbers, MAC addresses)
at runtime through a userspace interface exported using configfs.
See <file:Documentation/networking/netconsole.txt> for details.
To compile this driver as a module, choose M here: the module
will be called eql. If unsure, say N.
config NETPOLL
def_bool NETCONSOLE
config NETPOLL_TRAP
bool "Netpoll traffic trapping"
default n
depends on NETPOLL
config NET_POLL_CONTROLLER
def_bool NETPOLL
config RIONET
tristate "RapidIO Ethernet over messaging driver support"
depends on RAPIDIO
config RIONET_TX_SIZE
int "Number of outbound queue entries"
depends on RIONET
default "128"
config RIONET_RX_SIZE
int "Number of inbound queue entries"
depends on RIONET
default "128"
config TUN
tristate "Universal TUN/TAP device driver support"
@ -151,6 +223,28 @@ config VETH
When one end receives the packet it appears on its pair and vice
versa.
config VIRTIO_NET
tristate "Virtio network driver (EXPERIMENTAL)"
depends on EXPERIMENTAL && VIRTIO
---help---
This is the virtual network driver for virtio. It can be used with
lguest or QEMU based VMMs (like KVM or Xen). Say Y or M.
endif # NET_CORE
config SUNGEM_PHY
tristate
source "drivers/net/arcnet/Kconfig"
source "drivers/atm/Kconfig"
source "drivers/net/caif/Kconfig"
source "drivers/net/ethernet/Kconfig"
source "drivers/net/fddi/Kconfig"
config NET_SB1000
tristate "General Instruments Surfboard 1000"
depends on PNP
@ -175,46 +269,26 @@ config NET_SB1000
If you don't have this card, of course say N.
source "drivers/net/arcnet/Kconfig"
config MII
tristate "Generic Media Independent Interface device support"
help
Most ethernet controllers have MII transceiver either as an external
or internal device. It is safe to say Y or M here even if your
ethernet card lacks MII.
source "drivers/net/phy/Kconfig"
config SUNGEM_PHY
tristate
source "drivers/net/plip/Kconfig"
#
# Ethernet
#
source "drivers/net/ppp/Kconfig"
source "drivers/net/ethernet/Kconfig"
source "drivers/net/slip/Kconfig"
source "drivers/s390/net/Kconfig"
source "drivers/net/tokenring/Kconfig"
source "drivers/net/usb/Kconfig"
source "drivers/net/wireless/Kconfig"
source "drivers/net/wimax/Kconfig"
source "drivers/net/usb/Kconfig"
source "drivers/net/pcmcia/Kconfig"
source "drivers/net/wan/Kconfig"
source "drivers/atm/Kconfig"
source "drivers/ieee802154/Kconfig"
source "drivers/s390/net/Kconfig"
source "drivers/net/caif/Kconfig"
config XEN_NETDEV_FRONTEND
tristate "Xen network device frontend driver"
depends on XEN
@ -254,444 +328,6 @@ config XEN_NETDEV_BACKEND
compile this driver as a module, chose M here: the module
will be called xen-netback.
config RIONET
tristate "RapidIO Ethernet over messaging driver support"
depends on RAPIDIO
config RIONET_TX_SIZE
int "Number of outbound queue entries"
depends on RIONET
default "128"
config RIONET_RX_SIZE
int "Number of inbound queue entries"
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
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
---help---
PLIP (Parallel Line Internet Protocol) is used to create a
reasonably fast mini network consisting of two (or, rarely, more)
local machines. A PLIP link from a Linux box is a popular means to
install a Linux distribution on a machine which doesn't have a
CD-ROM drive (a minimal system has to be transferred with floppies
first). The kernels on both machines need to have this PLIP option
enabled for this to work.
The PLIP driver has two modes, mode 0 and mode 1. The parallel
ports (the connectors at the computers with 25 holes) are connected
with "null printer" or "Turbo Laplink" cables which can transmit 4
bits at a time (mode 0) or with special PLIP cables, to be used on
bidirectional parallel ports only, which can transmit 8 bits at a
time (mode 1); you can find the wiring of these cables in
<file:Documentation/networking/PLIP.txt>. The cables can be up to
15m long. Mode 0 works also if one of the machines runs DOS/Windows
and has some PLIP software installed, e.g. the Crynwr PLIP packet
driver (<http://oak.oakland.edu/simtel.net/msdos/pktdrvr-pre.html>)
and winsock or NCSA's telnet.
If you want to use PLIP, say Y and read the PLIP mini-HOWTO as well
as the NET-3-HOWTO, both available from
<http://www.tldp.org/docs.html#howto>. Note that the PLIP
protocol has been changed and this PLIP driver won't work together
with the PLIP support in Linux versions 1.0.x. This option enlarges
your kernel by about 8 KB.
To compile this driver as a module, choose M here. The module
will be called plip. If unsure, say Y or M, in case you buy
a laptop later.
config PPP
tristate "PPP (point-to-point protocol) support"
select SLHC
---help---
PPP (Point to Point Protocol) is a newer and better SLIP. It serves
the same purpose: sending Internet traffic over telephone (and other
serial) lines. Ask your access provider if they support it, because
otherwise you can't use it; most Internet access providers these
days support PPP rather than SLIP.
To use PPP, you need an additional program called pppd as described
in the PPP-HOWTO, available at
<http://www.tldp.org/docs.html#howto>. Make sure that you have
the version of pppd recommended in <file:Documentation/Changes>.
The PPP option enlarges your kernel by about 16 KB.
There are actually two versions of PPP: the traditional PPP for
asynchronous lines, such as regular analog phone lines, and
synchronous PPP which can be used over digital ISDN lines for
example. If you want to use PPP over phone lines or other
asynchronous serial lines, you need to say Y (or M) here and also to
the next option, "PPP support for async serial ports". For PPP over
synchronous lines, you should say Y (or M) here and to "Support
synchronous PPP", below.
If you said Y to "Version information on all symbols" above, then
you cannot compile the PPP driver into the kernel; you can then only
compile it as a module. To compile this driver as a module, choose M
here. The module will be called ppp_generic.
config PPP_MULTILINK
bool "PPP multilink support (EXPERIMENTAL)"
depends on PPP && EXPERIMENTAL
help
PPP multilink is a protocol (defined in RFC 1990) which allows you
to combine several (logical or physical) lines into one logical PPP
connection, so that you can utilize your full bandwidth.
This has to be supported at the other end as well and you need a
version of the pppd daemon which understands the multilink protocol.
If unsure, say N.
config PPP_FILTER
bool "PPP filtering"
depends on PPP
help
Say Y here if you want to be able to filter the packets passing over
PPP interfaces. This allows you to control which packets count as
activity (i.e. which packets will reset the idle timer or bring up
a demand-dialed link) and which packets are to be dropped entirely.
You need to say Y here if you wish to use the pass-filter and
active-filter options to pppd.
If unsure, say N.
config PPP_ASYNC
tristate "PPP support for async serial ports"
depends on PPP
select CRC_CCITT
---help---
Say Y (or M) here if you want to be able to use PPP over standard
asynchronous serial ports, such as COM1 or COM2 on a PC. If you use
a modem (not a synchronous or ISDN modem) to contact your ISP, you
need this option.
To compile this driver as a module, choose M here.
If unsure, say Y.
config PPP_SYNC_TTY
tristate "PPP support for sync tty ports"
depends on PPP
help
Say Y (or M) here if you want to be able to use PPP over synchronous
(HDLC) tty devices, such as the SyncLink adapter. These devices
are often used for high-speed leased lines like T1/E1.
To compile this driver as a module, choose M here.
config PPP_DEFLATE
tristate "PPP Deflate compression"
depends on PPP
select ZLIB_INFLATE
select ZLIB_DEFLATE
---help---
Support for the Deflate compression method for PPP, which uses the
Deflate algorithm (the same algorithm that gzip uses) to compress
each PPP packet before it is sent over the wire. The machine at the
other end of the PPP link (usually your ISP) has to support the
Deflate compression method as well for this to be useful. Even if
they don't support it, it is safe to say Y here.
To compile this driver as a module, choose M here.
config PPP_BSDCOMP
tristate "PPP BSD-Compress compression"
depends on PPP
---help---
Support for the BSD-Compress compression method for PPP, which uses
the LZW compression method to compress each PPP packet before it is
sent over the wire. The machine at the other end of the PPP link
(usually your ISP) has to support the BSD-Compress compression
method as well for this to be useful. Even if they don't support it,
it is safe to say Y here.
The PPP Deflate compression method ("PPP Deflate compression",
above) is preferable to BSD-Compress, because it compresses better
and is patent-free.
Note that the BSD compression code will always be compiled as a
module; it is called bsd_comp and will show up in the directory
modules once you have said "make modules". If unsure, say N.
config PPP_MPPE
tristate "PPP MPPE compression (encryption) (EXPERIMENTAL)"
depends on PPP && EXPERIMENTAL
select CRYPTO
select CRYPTO_SHA1
select CRYPTO_ARC4
select CRYPTO_ECB
---help---
Support for the MPPE Encryption protocol, as employed by the
Microsoft Point-to-Point Tunneling Protocol.
See http://pptpclient.sourceforge.net/ for information on
configuring PPTP clients and servers to utilize this method.
config PPPOE
tristate "PPP over Ethernet (EXPERIMENTAL)"
depends on EXPERIMENTAL && PPP
help
Support for PPP over Ethernet.
This driver requires the latest version of pppd from the CVS
repository at cvs.samba.org. Alternatively, see the
RoaringPenguin package (<http://www.roaringpenguin.com/pppoe>)
which contains instruction on how to use this driver (under
the heading "Kernel mode PPPoE").
config PPTP
tristate "PPP over IPv4 (PPTP) (EXPERIMENTAL)"
depends on EXPERIMENTAL && PPP && NET_IPGRE_DEMUX
help
Support for PPP over IPv4.(Point-to-Point Tunneling Protocol)
This driver requires pppd plugin to work in client mode or
modified pptpd (poptop) to work in server mode.
See http://accel-pptp.sourceforge.net/ for information how to
utilize this module.
config PPPOATM
tristate "PPP over ATM"
depends on ATM && PPP
help
Support PPP (Point to Point Protocol) encapsulated in ATM frames.
This implementation does not yet comply with section 8 of RFC2364,
which can lead to bad results if the ATM peer loses state and
changes its encapsulation unilaterally.
config PPPOL2TP
tristate "PPP over L2TP (EXPERIMENTAL)"
depends on EXPERIMENTAL && L2TP && PPP
help
Support for PPP-over-L2TP socket family. L2TP is a protocol
used by ISPs and enterprises to tunnel PPP traffic over UDP
tunnels. L2TP is replacing PPTP for VPN uses.
config SLIP
tristate "SLIP (serial line) support"
---help---
Say Y if you intend to use SLIP or CSLIP (compressed SLIP) to
connect to your Internet service provider or to connect to some
other local Unix box or if you want to configure your Linux box as a
Slip/CSlip server for other people to dial in. SLIP (Serial Line
Internet Protocol) is a protocol used to send Internet traffic over
serial connections such as telephone lines or null modem cables;
nowadays, the protocol PPP is more commonly used for this same
purpose.
Normally, your access provider has to support SLIP in order for you
to be able to use it, but there is now a SLIP emulator called SLiRP
around (available from
<ftp://ibiblio.org/pub/Linux/system/network/serial/>) which
allows you to use SLIP over a regular dial up shell connection. If
you plan to use SLiRP, make sure to say Y to CSLIP, below. The
NET-3-HOWTO, available from
<http://www.tldp.org/docs.html#howto>, explains how to
configure SLIP. Note that you don't need this option if you just
want to run term (term is a program which gives you almost full
Internet connectivity if you have a regular dial up shell account on
some Internet connected Unix computer. Read
<http://www.bart.nl/~patrickr/term-howto/Term-HOWTO.html>). SLIP
support will enlarge your kernel by about 4 KB. If unsure, say N.
To compile this driver as a module, choose M here. The module
will be called slip.
config SLIP_COMPRESSED
bool "CSLIP compressed headers"
depends on SLIP
select SLHC
---help---
This protocol is faster than SLIP because it uses compression on the
TCP/IP headers (not on the data itself), but it has to be supported
on both ends. Ask your access provider if you are not sure and
answer Y, just in case. You will still be able to use plain SLIP. If
you plan to use SLiRP, the SLIP emulator (available from
<ftp://ibiblio.org/pub/Linux/system/network/serial/>) which
allows you to use SLIP over a regular dial up shell connection, you
definitely want to say Y here. The NET-3-HOWTO, available from
<http://www.tldp.org/docs.html#howto>, explains how to configure
CSLIP. This won't enlarge your kernel.
config SLHC
tristate
help
This option enables Van Jacobsen serial line header compression
routines.
config SLIP_SMART
bool "Keepalive and linefill"
depends on SLIP
help
Adds additional capabilities to the SLIP driver to support the
RELCOM line fill and keepalive monitoring. Ideal on poor quality
analogue lines.
config SLIP_MODE_SLIP6
bool "Six bit SLIP encapsulation"
depends on SLIP
help
Just occasionally you may need to run IP over hostile serial
networks that don't pass all control characters or are only seven
bit. Saying Y here adds an extra mode you can use with SLIP:
"slip6". In this mode, SLIP will only send normal ASCII symbols over
the serial device. Naturally, this has to be supported at the other
end of the link as well. It's good enough, for example, to run IP
over the async ports of a Camtec JNT Pad. If unsure, say N.
config NET_FC
bool "Fibre Channel driver support"
depends on SCSI && PCI
help
Fibre Channel is a high speed serial protocol mainly used to connect
large storage devices to the computer; it is compatible with and
intended to replace SCSI.
If you intend to use Fibre Channel, you need to have a Fibre channel
adaptor card in your computer; say Y here and to the driver for your
adaptor below. You also should have said Y to "SCSI support" and
"SCSI generic support".
config NETCONSOLE
tristate "Network console logging support"
---help---
If you want to log kernel messages over the network, enable this.
See <file:Documentation/networking/netconsole.txt> for details.
config NETCONSOLE_DYNAMIC
bool "Dynamic reconfiguration of logging targets"
depends on NETCONSOLE && SYSFS && CONFIGFS_FS && \
!(NETCONSOLE=y && CONFIGFS_FS=m)
help
This option enables the ability to dynamically reconfigure target
parameters (interface, IP addresses, port numbers, MAC addresses)
at runtime through a userspace interface exported using configfs.
See <file:Documentation/networking/netconsole.txt> for details.
config NETPOLL
def_bool NETCONSOLE
config NETPOLL_TRAP
bool "Netpoll traffic trapping"
default n
depends on NETPOLL
config NET_POLL_CONTROLLER
def_bool NETPOLL
config VIRTIO_NET
tristate "Virtio network driver (EXPERIMENTAL)"
depends on EXPERIMENTAL && VIRTIO
---help---
This is the virtual network driver for virtio. It can be used with
lguest or QEMU based VMMs (like KVM or Xen). Say Y or M.
config VMXNET3
tristate "VMware VMXNET3 ethernet driver"
depends on PCI && INET

96
drivers/net/Makefile
View File

@ -2,57 +2,61 @@
# Makefile for the Linux network device drivers.
#
obj-$(CONFIG_MII) += mii.o
obj-$(CONFIG_MDIO) += mdio.o
obj-$(CONFIG_PHYLIB) += phy/
obj-$(CONFIG_CAN) += can/
#
# Networking Core Drivers
#
obj-$(CONFIG_BONDING) += bonding/
obj-$(CONFIG_VMXNET3) += vmxnet3/
#
# link order important here
#
obj-$(CONFIG_PLIP) += plip.o
obj-$(CONFIG_ROADRUNNER) += rrunner.o
obj-$(CONFIG_SKFP) += skfp/
obj-$(CONFIG_RIONET) += rionet.o
#
# end link order section
#
obj-$(CONFIG_NET) += Space.o loopback.o
obj-$(CONFIG_NET_SB1000) += sb1000.o
obj-$(CONFIG_PPP) += ppp_generic.o
obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o
obj-$(CONFIG_PPP_DEFLATE) += ppp_deflate.o
obj-$(CONFIG_PPP_BSDCOMP) += bsd_comp.o
obj-$(CONFIG_PPP_MPPE) += ppp_mppe.o
obj-$(CONFIG_PPPOE) += pppox.o pppoe.o
obj-$(CONFIG_PPPOL2TP) += pppox.o
obj-$(CONFIG_PPTP) += pppox.o pptp.o
obj-$(CONFIG_SLIP) += slip.o
obj-$(CONFIG_SLHC) += slhc.o
obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
obj-$(CONFIG_XEN_NETDEV_BACKEND) += xen-netback/
obj-$(CONFIG_DUMMY) += dummy.o
obj-$(CONFIG_EQUALIZER) += eql.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_MII) += mii.o
obj-$(CONFIG_MDIO) += mdio.o
obj-$(CONFIG_NET) += Space.o loopback.o
obj-$(CONFIG_NETCONSOLE) += netconsole.o
obj-$(CONFIG_PHYLIB) += phy/
obj-$(CONFIG_RIONET) += rionet.o
obj-$(CONFIG_TUN) += tun.o
obj-$(CONFIG_VETH) += veth.o
obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
#
# Networking Drivers
#
obj-$(CONFIG_ARCNET) += arcnet/
obj-$(CONFIG_DEV_APPLETALK) += appletalk/
obj-$(CONFIG_CAIF) += caif/
obj-$(CONFIG_CAN) += can/
obj-$(CONFIG_ETRAX_ETHERNET) += cris/
obj-$(CONFIG_ETHERNET) += ethernet/
obj-$(CONFIG_FDDI) += fddi/
obj-$(CONFIG_HIPPI) += hippi/
obj-$(CONFIG_HAMRADIO) += hamradio/
obj-$(CONFIG_IRDA) += irda/
obj-$(CONFIG_PLIP) += plip/
onj-$(CONFIG_PPP) += ppp/
obj-$(CONFIG_PPP_ASYNC) += ppp/
obj-$(CONFIG_PPP_BSDCOMP) += ppp/
obj-$(CONFIG_PPP_DEFLATE) += ppp/
obj-$(CONFIG_PPP_MPPE) += ppp/
obj-$(CONFIG_PPP_SYNC_TTY) += ppp/
obj-$(CONFIG_PPPOE) += ppp/
obj-$(CONFIG_PPPOL2TP) += ppp/
obj-$(CONFIG_PPTP) += ppp/
onj-$(CONFIG_SLIP) += slip/
obj-$(CONFIG_SLHC) += slip/
obj-$(CONFIG_NET_SB1000) += sb1000.o
onj-$(CONFIG_SLIP) += slip/
obj-$(CONFIG_SUNGEM_PHY) += sungem_phy.o
obj-$(CONFIG_TR) += tokenring/
obj-$(CONFIG_WAN) += wan/
obj-$(CONFIG_ARCNET) += arcnet/
obj-$(CONFIG_NET_PCMCIA) += pcmcia/
obj-$(CONFIG_WLAN) += wireless/
obj-$(CONFIG_WIMAX) += wimax/
obj-$(CONFIG_VMXNET3) += vmxnet3/
obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
obj-$(CONFIG_XEN_NETDEV_BACKEND) += xen-netback/
obj-$(CONFIG_USB_CATC) += usb/
obj-$(CONFIG_USB_KAWETH) += usb/
@ -63,17 +67,3 @@ obj-$(CONFIG_USB_USBNET) += usb/
obj-$(CONFIG_USB_ZD1201) += usb/
obj-$(CONFIG_USB_IPHETH) += usb/
obj-$(CONFIG_USB_CDC_PHONET) += usb/
obj-$(CONFIG_WLAN) += wireless/
obj-$(CONFIG_HAMRADIO) += hamradio/
obj-$(CONFIG_IRDA) += irda/
obj-$(CONFIG_ETRAX_ETHERNET) += cris/
obj-$(CONFIG_NETCONSOLE) += netconsole.o
obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
obj-$(CONFIG_WIMAX) += wimax/
obj-$(CONFIG_CAIF) += caif/
obj-$(CONFIG_SUNGEM_PHY) += sungem_phy.o

14
drivers/net/arcnet/Kconfig
View File

@ -3,8 +3,8 @@
#
menuconfig ARCNET
depends on NETDEVICES && (ISA || PCI)
tristate "ARCnet support"
depends on NETDEVICES && (ISA || PCI || PCMCIA)
bool "ARCnet support"
---help---
If you have a network card of this type, say Y and check out the
(arguably) beautiful poetry in
@ -123,4 +123,14 @@ config ARCNET_COM20020_PCI
tristate "Support for COM20020 on PCI"
depends on ARCNET_COM20020 && PCI
config ARCNET_COM20020_CS
tristate "COM20020 ARCnet PCMCIA support"
depends on ARCNET_COM20020 && PCMCIA
help
Say Y here if you intend to attach this type of ARCnet PCMCIA card
to your computer.
To compile this driver as a module, choose M here: the module will be
called com20020_cs. If unsure, say N.
endif # ARCNET

1
drivers/net/arcnet/Makefile
View File

@ -12,3 +12,4 @@ obj-$(CONFIG_ARCNET_RIM_I) += arc-rimi.o
obj-$(CONFIG_ARCNET_COM20020) += com20020.o
obj-$(CONFIG_ARCNET_COM20020_ISA) += com20020-isa.o
obj-$(CONFIG_ARCNET_COM20020_PCI) += com20020-pci.o
obj-$(CONFIG_ARCNET_COM20020_CS) += com20020_cs.o

0
drivers/net/pcmcia/com20020_cs.c → drivers/net/arcnet/com20020_cs.c
View File

1
drivers/net/ethernet/3com/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_3COM
bool "3Com devices"
default y
depends on ISA || EISA || MCA || PCI || PCMCIA
---help---
If you have a network (Ethernet) card belonging to this class, say Y

1
drivers/net/ethernet/8390/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_8390
bool "National Semi-conductor 8390 devices"
default y
depends on NET_VENDOR_NATSEMI && (AMIGA_PCMCIA || PCI || SUPERH || \
ISA || MCA || EISA || MAC || M32R || MACH_TX49XX || \
MCA_LEGACY || H8300 || ARM || MIPS || ZORRO || PCMCIA || \

1
drivers/net/ethernet/adaptec/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_ADAPTEC
bool "Adaptec devices"
default y
depends on PCI
---help---
If you have a network (Ethernet) card belonging to this class, say Y

1
drivers/net/ethernet/alteon/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_ALTEON
bool "Alteon devices"
default y
depends on PCI
---help---
If you have a network (Ethernet) card belonging to this class, say Y

1
drivers/net/ethernet/amd/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_AMD
bool "AMD devices"
default y
depends on DIO || MACH_DECSTATION || MVME147 || ATARI || SUN3 || \
SUN3X || SBUS || PCI || ZORRO || (ISA && ISA_DMA_API) || \
(ARM && ARCH_EBSA110) || ISA || EISA || MCA || PCMCIA

1
drivers/net/ethernet/apple/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_APPLE
bool "Apple devices"
default y
depends on (PPC_PMAC && PPC32) || MAC || ISA || EISA || MACH_IXDP2351 \
|| ARCH_IXDP2X01 || MACH_MX31ADS || MACH_QQ2440
---help---

1
drivers/net/ethernet/atheros/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_ATHEROS
bool "Atheros devices"
default y
depends on PCI
---help---
If you have a network (Ethernet) card belonging to this class, say Y

1
drivers/net/ethernet/broadcom/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_BROADCOM
bool "Broadcom devices"
default y
depends on (SSB_POSSIBLE && HAS_DMA) || PCI || BCM63XX || \
SIBYTE_SB1xxx_SOC
---help---

1
drivers/net/ethernet/brocade/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_BROCADE
bool "Brocade devices"
default y
depends on PCI
---help---
If you have a network (Ethernet) card belonging to this class, say Y

1
drivers/net/ethernet/chelsio/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_CHELSIO
bool "Chelsio devices"
default y
depends on PCI || INET
---help---
If you have a network (Ethernet) card belonging to this class, say Y

1
drivers/net/ethernet/cirrus/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_CIRRUS
bool "Cirrus devices"
default y
depends on ARM && ARCH_EP93XX
---help---
If you have a network (Ethernet) card belonging to this class, say Y

1
drivers/net/ethernet/cisco/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_CISCO
bool "Cisco devices"
default y
depends on PCI && INET
---help---
If you have a network (Ethernet) card belonging to this class, say Y

1
drivers/net/ethernet/dec/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_DEC
bool "Digital Equipment devices"
default y
depends on PCI || EISA || CARDBUS
---help---
If you have a network (Ethernet) card belonging to this class, say Y

1
drivers/net/ethernet/dlink/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_DLINK
bool "D-Link devices"
default y
depends on PCI || PARPORT
---help---
If you have a network (Ethernet) card belonging to this class, say Y

1
drivers/net/ethernet/emulex/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_EMULEX
bool "Emulex devices"
default y
depends on PCI && INET
---help---
If you have a network (Ethernet) card belonging to this class, say Y

1
drivers/net/ethernet/faraday/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_FARADAY
bool "Faraday devices"
default y
depends on ARM
---help---
If you have a network (Ethernet) card belonging to this class, say Y

1
drivers/net/ethernet/freescale/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_FREESCALE
bool "Freescale devices"
default y
depends on FSL_SOC || QUICC_ENGINE || CPM1 || CPM2 || PPC_MPC512x || \
M523x || M527x || M5272 || M528x || M520x || M532x || \
IMX_HAVE_PLATFORM_FEC || MXS_HAVE_PLATFORM_FEC || \

1
drivers/net/ethernet/fujitsu/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_FUJITSU
bool "Fujitsu devices"
default y
depends on ISA || PCMCIA || ((ISA || MCA_LEGACY) && EXPERIMENTAL)
---help---
If you have a network (Ethernet) card belonging to this class, say Y

1
drivers/net/ethernet/hp/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_HP
bool "HP devices"
default y
depends on ISA || EISA || PCI
---help---
If you have a network (Ethernet) card belonging to this class, say Y

1
drivers/net/ethernet/i825xx/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_I825XX
bool "Intel (82586/82593/82596) devices"
default y
depends on NET_VENDOR_INTEL && (ISA || ISA_DMA_API || ARM || \
ARCH_ACORN || MCA || MCA_LEGACY || SNI_RM || SUN3 || \
GSC || BVME6000 || MVME16x || EXPERIMENTAL)

1
drivers/net/ethernet/ibm/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_IBM
bool "IBM devices"
default y
depends on MCA || PPC_PSERIES || PPC_PSERIES || PPC_DCR || \
(IBMEBUS && INET && SPARSEMEM)
---help---

1
drivers/net/ethernet/intel/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_INTEL
bool "Intel devices"
default y
depends on PCI || PCI_MSI
---help---
If you have a network (Ethernet) card belonging to this class, say Y

1
drivers/net/ethernet/marvell/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_MARVELL
bool "Marvell devices"
default y
depends on PCI || CPU_PXA168 || MV64X60 || PPC32 || PLAT_ORION || INET
---help---
If you have a network (Ethernet) card belonging to this class, say Y

1
drivers/net/ethernet/mellanox/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_MELLANOX
bool "Mellanox devices"
default y
depends on PCI && INET
---help---
If you have a network (Ethernet) card belonging to this class, say Y

1
drivers/net/ethernet/micrel/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_MICREL
bool "Micrel devices"
default y
depends on (HAS_IOMEM && DMA_ENGINE) || SPI || PCI || HAS_IOMEM || \
(ARM && ARCH_KS8695)
---help---

1
drivers/net/ethernet/microchip/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_MICROCHIP
bool "Microchip devices"
default y
depends on SPI && EXPERIMENTAL
---help---
If you have a network (Ethernet) card belonging to this class, say Y

1
drivers/net/ethernet/myricom/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_MYRI
bool "Myricom devices"
default y
depends on PCI && INET
---help---
If you have a network (Ethernet) card belonging to this class, say

1
drivers/net/ethernet/natsemi/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_NATSEMI
bool "National Semi-conductor devices"
default y
depends on MCA || MAC || MACH_JAZZ || PCI || XTENSA_PLATFORM_XT2000
---help---
If you have a network (Ethernet) card belonging to this class, say Y

1
drivers/net/ethernet/neterion/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_EXAR
bool "Exar devices"
default y
depends on PCI
---help---
If you have a network (Ethernet) card belonging to this class, say

1
drivers/net/ethernet/nuvoton/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_NUVOTON
bool "Nuvoton devices"
default y
depends on ARM && ARCH_W90X900
---help---
If you have a network (Ethernet) card belonging to this class, say Y

1
drivers/net/ethernet/nvidia/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_NVIDIA
bool "NVIDIA devices"
default y
depends on PCI
---help---
If you have a network (Ethernet) card belonging to this class, say Y

1
drivers/net/ethernet/oki-semi/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_OKI
bool "OKI Semiconductor devices"
default y
depends on PCI
---help---
If you have a network (Ethernet) card belonging to this class, say Y

1
drivers/net/ethernet/pasemi/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_PASEMI
bool "PA Semi devices"
default y
depends on PPC_PASEMI && PCI && INET
---help---
If you have a network (Ethernet) card belonging to this class, say Y

1
drivers/net/ethernet/qlogic/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_QLOGIC
bool "QLogic devices"
default y
depends on PCI
---help---
If you have a network (Ethernet) card belonging to this class, say Y

1
drivers/net/ethernet/racal/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_RACAL
bool "Racal-Interlan (Micom) NI devices"
default y
depends on ISA
---help---
If you have a network (Ethernet) card belonging to this class, such

1
drivers/net/ethernet/rdc/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_RDC
bool "RDC devices"
default y
depends on PCI
---help---
If you have a network (Ethernet) card belonging to this class, say Y

1
drivers/net/ethernet/realtek/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_REALTEK
bool "Realtek devices"
default y
depends on PCI || (PARPORT && X86)
---help---
If you have a network (Ethernet) card belonging to this class, say Y

1
drivers/net/ethernet/seeq/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_SEEQ
bool "SEEQ devices"
default y
depends on (ARM && ARCH_ACORN) || SGI_HAS_SEEQ || EXPERIMENTAL
---help---
If you have a network (Ethernet) card belonging to this class, say Y

1
drivers/net/ethernet/sgi/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_SGI
bool "SGI devices"
default y
depends on (PCI && SGI_IP27) || SGI_IP32
---help---
If you have a network (Ethernet) card belonging to this class, say Y

1
drivers/net/ethernet/sis/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_SIS
bool "Silicon Integrated Systems (SiS) devices"
default y
depends on PCI
---help---
If you have a network (Ethernet) card belonging to this class, say Y

1
drivers/net/ethernet/smsc/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_SMSC
bool "SMC (SMSC)/Western Digital devices"
default y
depends on ARM || ISA || MAC || ARM || MIPS || M32R || SUPERH || \
BLACKFIN || MN10300 || COLDFIRE || PCI || PCMCIA
---help---

1
drivers/net/ethernet/stmicro/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_STMICRO
bool "STMicroelectronics devices"
default y
depends on HAS_IOMEM
---help---
If you have a network (Ethernet) card belonging to this class, say Y

1
drivers/net/ethernet/sun/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_SUN
bool "Sun devices"
default y
depends on SUN3 || SBUS || PCI || SUN_LDOMS
---help---
If you have a network (Ethernet) card belonging to this class, say

1
drivers/net/ethernet/tehuti/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_TEHUTI
bool "Tehuti devices"
default y
depends on PCI
---help---
If you have a network (Ethernet) card belonging to this class, say Y

1
drivers/net/ethernet/ti/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_TI
bool "Texas Instruments (TI) devices"
default y
depends on PCI || EISA || AR7 || (ARM && (ARCH_DAVINCI || ARCH_OMAP3))
---help---
If you have a network (Ethernet) card belonging to this class, say Y

1
drivers/net/ethernet/toshiba/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_TOSHIBA
bool "Toshiba devices"
default y
depends on PCI && (PPC_IBM_CELL_BLADE || PPC_CELLEB) || PPC_PS3
---help---
If you have a network (Ethernet) card belonging to this class, say Y

1
drivers/net/ethernet/tundra/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_TUNDRA
bool "Tundra devices"
default y
depends on TSI108_BRIDGE
---help---
If you have a network (Ethernet) card belonging to this class, say Y

1
drivers/net/ethernet/via/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_VIA
bool "VIA devices"
default y
depends on PCI
---help---
If you have a network (Ethernet) card belonging to this class, say Y

1
drivers/net/ethernet/xilinx/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_XILINX
bool "Xilinx devices"
default y
depends on PPC || PPC32 || MICROBLAZE
---help---
If you have a network (Ethernet) card belonging to this class, say Y

1
drivers/net/ethernet/xircom/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_XIRCOM
bool "Xircom devices"
default y
depends on PCMCIA
---help---
If you have a network (Ethernet) card belonging to this class, say Y

1
drivers/net/ethernet/xscale/Kconfig
View File

@ -4,6 +4,7 @@
config NET_VENDOR_XSCALE
bool "Intel XScale IXP devices"
default y
depends on NET_VENDOR_INTEL && ((ARM && ARCH_IXP4XX && \
IXP4XX_NPE && IXP4XX_QMGR) || ARCH_ENP2611)
---help---

77
drivers/net/fddi/Kconfig Normal file
View File

@ -0,0 +1,77 @@
#
# 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

6
drivers/net/fddi/Makefile Normal file
View File

@ -0,0 +1,6 @@
#
# Makefile for the Linux FDDI network device drivers.
#
obj-$(CONFIG_DEFXX) += defxx.o
obj-$(CONFIG_SKFP) += skfp/

0
drivers/net/defxx.c → drivers/net/fddi/defxx.c
View File

0
drivers/net/defxx.h → drivers/net/fddi/defxx.h
View File

0
drivers/net/skfp/Makefile → drivers/net/fddi/skfp/Makefile
View File

0
drivers/net/skfp/cfm.c → drivers/net/fddi/skfp/cfm.c
View File

0
drivers/net/skfp/drvfbi.c → drivers/net/fddi/skfp/drvfbi.c
View File

0
drivers/net/skfp/ecm.c → drivers/net/fddi/skfp/ecm.c
View File

0
drivers/net/skfp/ess.c → drivers/net/fddi/skfp/ess.c
View File

0
drivers/net/skfp/fplustm.c → drivers/net/fddi/skfp/fplustm.c
View File

4
drivers/net/skfp/h/cmtdef.h → drivers/net/fddi/skfp/h/cmtdef.h
View File

@ -477,8 +477,8 @@ struct s_plc {
/*
* function prototypes
*/
#include "h/mbuf.h" /* Type definitions for MBUFs */
#include "h/smtstate.h" /* struct smt_state */
#include "mbuf.h" /* Type definitions for MBUFs */
#include "smtstate.h" /* struct smt_state */
void hwt_restart(struct s_smc *smc); /* hwt.c */
SMbuf *smt_build_frame(struct s_smc *smc, int class, int type,

0
drivers/net/skfp/h/fddi.h → drivers/net/fddi/skfp/h/fddi.h
View File

0
drivers/net/skfp/h/fddimib.h → drivers/net/fddi/skfp/h/fddimib.h
View File

0
drivers/net/skfp/h/fplustm.h → drivers/net/fddi/skfp/h/fplustm.h
View File

2
drivers/net/skfp/h/hwmtm.h → drivers/net/fddi/skfp/h/hwmtm.h
View File

@ -15,7 +15,7 @@
#ifndef _HWM_
#define _HWM_
#include "h/mbuf.h"
#include "mbuf.h"
/*
* MACRO for DMA synchronization:

0
drivers/net/skfp/h/mbuf.h → drivers/net/fddi/skfp/h/mbuf.h
View File

0
drivers/net/skfp/h/osdef1st.h → drivers/net/fddi/skfp/h/osdef1st.h
View File

4
drivers/net/skfp/h/sba.h → drivers/net/fddi/skfp/h/sba.h
View File

@ -19,8 +19,8 @@
#ifndef _SBA_
#define _SBA_
#include "h/mbuf.h"
#include "h/sba_def.h"
#include "mbuf.h"
#include "sba_def.h"
#ifdef SBA

0
drivers/net/skfp/h/sba_def.h → drivers/net/fddi/skfp/h/sba_def.h
View File

0
drivers/net/skfp/h/skfbi.h → drivers/net/fddi/skfp/h/skfbi.h
View File

2
drivers/net/skfp/h/skfbiinc.h → drivers/net/fddi/skfp/h/skfbiinc.h
View File

@ -15,7 +15,7 @@
#ifndef _SKFBIINC_
#define _SKFBIINC_
#include "h/supern_2.h"
#include "supern_2.h"
/*
* special defines for use into .asm files

14
drivers/net/skfp/h/smc.h → drivers/net/fddi/skfp/h/smc.h
View File

@ -38,18 +38,18 @@
* fddi.h
*/
#ifdef OSDEF
#include "h/osdef1st.h"
#include "osdef1st.h"
#endif /* OSDEF */
#ifdef OEM_CONCEPT
#include "oemdef.h"
#endif /* OEM_CONCEPT */
#include "h/smt.h"
#include "h/cmtdef.h"
#include "h/fddimib.h"
#include "h/targethw.h" /* all target hw dependencies */
#include "h/targetos.h" /* all target os dependencies */
#include "smt.h"
#include "cmtdef.h"
#include "fddimib.h"
#include "targethw.h" /* all target hw dependencies */
#include "targetos.h" /* all target os dependencies */
#ifdef ESS
#include "h/sba.h"
#include "sba.h"
#endif
/*

0
drivers/net/skfp/h/smt.h → drivers/net/fddi/skfp/h/smt.h
View File

0
drivers/net/skfp/h/smt_p.h → drivers/net/fddi/skfp/h/smt_p.h
View File

0
drivers/net/skfp/h/smtstate.h → drivers/net/fddi/skfp/h/smtstate.h
View File

0
drivers/net/skfp/h/supern_2.h → drivers/net/fddi/skfp/h/supern_2.h
View File

6
drivers/net/skfp/h/targethw.h → drivers/net/fddi/skfp/h/targethw.h
View File

@ -25,11 +25,11 @@
#define SK_ML_ID_2 0x30
#endif
#include "h/skfbi.h"
#include "skfbi.h"
#ifndef TAG_MODE
#include "h/fplus.h"
#include "fplus.h"
#else
#include "h/fplustm.h"
#include "fplustm.h"
#endif
#ifndef HW_PTR

2
drivers/net/skfp/h/targetos.h → drivers/net/fddi/skfp/h/targetos.h
View File

@ -58,7 +58,7 @@
#define ADDR(a) (((a)>>7) ? (outp(smc->hw.iop+B0_RAP,(a)>>7), (smc->hw.iop+( ((a)&0x7F) | ((a)>>7 ? 0x80:0)) )) : (smc->hw.iop+(((a)&0x7F)|((a)>>7 ? 0x80:0))))
#endif
#include "h/hwmtm.h"
#include "hwmtm.h"
#define TRUE 1
#define FALSE 0

0
drivers/net/skfp/h/types.h → drivers/net/fddi/skfp/h/types.h
View File

0
drivers/net/skfp/hwmtm.c → drivers/net/fddi/skfp/hwmtm.c
View File

0
drivers/net/skfp/hwt.c → drivers/net/fddi/skfp/hwt.c
View File

0
drivers/net/skfp/pcmplc.c → drivers/net/fddi/skfp/pcmplc.c
View File

0
drivers/net/skfp/pmf.c → drivers/net/fddi/skfp/pmf.c
View File

0
drivers/net/skfp/queue.c → drivers/net/fddi/skfp/queue.c
View File

0
drivers/net/skfp/rmt.c → drivers/net/fddi/skfp/rmt.c
View File

0
drivers/net/skfp/skfddi.c → drivers/net/fddi/skfp/skfddi.c
View File

0
drivers/net/skfp/smt.c → drivers/net/fddi/skfp/smt.c
View File

0
drivers/net/skfp/smtdef.c → drivers/net/fddi/skfp/smtdef.c
View File

0
drivers/net/skfp/smtinit.c → drivers/net/fddi/skfp/smtinit.c
View File

0
drivers/net/skfp/smttimer.c → drivers/net/fddi/skfp/smttimer.c
View File

0
drivers/net/skfp/srf.c → drivers/net/fddi/skfp/srf.c
View File

39
drivers/net/hippi/Kconfig Normal file
View File

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

5
drivers/net/hippi/Makefile Normal file
View File

@ -0,0 +1,5 @@
#
# Makefile for the HIPPI network device drivers.
#
obj-$(CONFIG_ROADRUNNER) += rrunner.o

Some files were not shown because too many files have changed in this diff Show More