Menu
▾
▴
[Gc-linux-cvs] linux/drivers/net Kconfig,1.5,1.6 Makefile,1.5,1.6
|
From: <aot...@us...> - 2004-05-11 17:48:45
|
Update of /cvsroot/gc-linux/linux/drivers/net In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26801/drivers/net Modified Files: Kconfig Makefile Log Message: Merged 2.6.6 Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/net/Kconfig,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Kconfig 24 Apr 2004 18:31:44 -0000 1.5 +++ Kconfig 11 May 2004 17:48:35 -0000 1.6 @@ -21,10 +21,6 @@ If unsure, say Y. -if NETDEVICES - source "drivers/net/arcnet/Kconfig" -endif - config DUMMY tristate "Dummy net driver support" depends on NETDEVICES @@ -155,6 +151,10 @@ If you don't have this card, of course say N. +if NETDEVICES + source "drivers/net/arcnet/Kconfig" +endif + # # Ethernet # @@ -477,11 +477,32 @@ bool "SGI IOC3 Ethernet" depends on NET_ETHERNET && SGI_IP27 select CRC32 + select MII 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>. +config SGI_IOC3_ETH_HW_RX_CSUM + bool "Receive hardware checksums" + depends on SGI_IOC3_ETH && INET + default y + help + The SGI IOC3 network adapter supports TCP and UDP checksums in + hardware to offload processing of these checksums from the CPU. At + the moment only acceleration of IPv4 is supported. This option + enables offloading for checksums on receive. If unsure, say Y. + +config SGI_IOC3_ETH_HW_TX_CSUM + bool "Transmit hardware checksums" + depends on SGI_IOC3_ETH && INET + default y + help + The SGI IOC3 network adapter supports TCP and UDP checksums in + hardware to offload processing of these checksums from the CPU. At + the moment only acceleration of IPv4 is supported. This option + enables offloading for checksums on transmit. If unsure, say Y. + config SGI_O2MACE_ETH tristate "SGI O2 MACE Fast Ethernet support" depends on NET_ETHERNET && SGI_IP32=y @@ -1170,7 +1191,7 @@ config IBMLANA tristate "IBM LAN Adapter/A support" - depends on NET_ETHERNET && MCA + depends on NET_ETHERNET && MCA && MCA_LEGACY ---help--- This is a Micro Channel Ethernet adapter. You need to set CONFIG_MCA to use this driver. It is both available as an in-kernel @@ -1184,6 +1205,17 @@ boards with this driver should be possible, but has not been tested up to now due to lack of hardware. +config IBMVETH + tristate "IBM LAN Virtual Ethernet support" + depends on NETDEVICES && NET_ETHERNET && PPC_PSERIES + ---help--- + This driver supports virtual ethernet adapters on newer IBM iSeries + and pSeries systems. + + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module will + be called ibmveth. + config NET_PCI bool "EISA, VLB, PCI and on board controllers" depends on NET_ETHERNET && (ISA || EISA || PCI) @@ -1225,6 +1257,9 @@ To compile this driver as a module, choose M here and read <file:Documentation/networking/net-modules.txt>. The module will be called amd8111e. +config AMD8111E_NAPI + bool "Enable NAPI support" + depends on AMD8111_ETH config ADAPTEC_STARFIRE tristate "Adaptec Starfire/DuraLAN support" @@ -1280,6 +1315,7 @@ config B44 tristate "Broadcom 4400 ethernet support (EXPERIMENTAL)" depends on NET_PCI && PCI && EXPERIMENTAL + select MII help If you have a network (Ethernet) controller of this type, say Y and read the Ethernet-HOWTO, available from @@ -1589,24 +1625,6 @@ experience problems, you can enable this option to restore the old RX-reset behavior. If unsure, say N. -config 8139_RXBUF_IDX - int "Receive ring size (0 => 8K, 1 => 16K, 2 => 32K, 3 => 64K)" - depends on 8139TOO - range 0 3 - default 1 if EMBEDDED || SH_DREAMCAST - default 2 - help - The 8139too driver has a fixed area of memory for receiving data. - The default value is adequate for most systems. The 64KB - ring size has hardware issues that may cause problems. - Values: - 0 => 8 KB - 1 => 16 KB embedded systems - 2 => 32 KB default for most systems - 3 => 64 KB - If unsure, use the default 2. - - config SIS900 tristate "SiS 900/7016 PCI Fast Ethernet Adapter support" depends on NET_PCI && PCI @@ -1787,7 +1805,7 @@ config DECLANCE tristate "DEC LANCE ethernet controller support" - depends on NET_ETHERNET && DECSTATION + depends on NET_ETHERNET && MACH_DECSTATION select CRC32 help This driver is for the series of Ethernet controllers produced by @@ -1968,16 +1986,6 @@ To compile this driver as a module, choose M here: the module will be called r8169. This is recommended. -config SIS190 - tristate "SiS190 gigabit ethernet support (EXPERIMENTAL)" - depends on PCI && EXPERIMENTAL - select CRC32 - ---help--- - Say Y here if you have a SiS 190 PCI Gigabit Ethernet adapter. - - To compile this driver as a module, choose M here: the module - will be called sis190. This is recommended. - config SK98LIN tristate "Marvell Yukon Chipset / SysKonnect SK-98xx Support" depends on PCI @@ -2107,10 +2115,33 @@ bool "Use Rx Polling (NAPI) (EXPERIMENTAL)" depends on IXGB && EXPERIMENTAL +config S2IO + tristate "S2IO 10Gbe XFrame NIC" + depends on PCI + ---help--- + This driver supports the 10Gbe XFrame NIC of S2IO. + For help regarding driver compilation, installation and + tuning please look into ~/drivers/net/s2io/README.txt. + +config S2IO_NAPI + bool "Use Rx Polling (NAPI) (EXPERIMENTAL)" + depends on S2IO && EXPERIMENTAL + endmenu +source "drivers/net/tokenring/Kconfig" -config VETH +source "drivers/net/wireless/Kconfig" + +source "drivers/net/pcmcia/Kconfig" + +source "drivers/net/wan/Kconfig" + +source "drivers/atm/Kconfig" + +source "drivers/s390/net/Kconfig" + +config ISERIES_VETH tristate "iSeries Virtual Ethernet driver support" depends on NETDEVICES && PPC_ISERIES @@ -2176,17 +2207,6 @@ 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 IBMVETH - tristate "IBM LAN Virtual Ethernet support" - depends on NETDEVICES && NET_ETHERNET && PPC_PSERIES - ---help--- - This driver supports virtual ethernet adapters on newer IBM iSeries - and pSeries systems. - - To compile this driver as a module, choose M here and read - <file:Documentation/networking/net-modules.txt>. The module will - be called ibmveth. - config ROADRUNNER tristate "Essential RoadRunner HIPPI PCI adapter support (EXPERIMENTAL)" depends on HIPPI && PCI @@ -2444,10 +2464,6 @@ 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. -source "drivers/net/wireless/Kconfig" - -source "drivers/net/tokenring/Kconfig" - config NET_FC bool "Fibre Channel driver support" depends on NETDEVICES && SCSI && PCI @@ -2507,11 +2523,3 @@ ---help--- If you want to log kernel messages over the network, enable this. See Documentation/networking/netconsole.txt for details. - -source "drivers/net/wan/Kconfig" - -source "drivers/net/pcmcia/Kconfig" - -source "drivers/atm/Kconfig" - -source "drivers/s390/net/Kconfig" Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/net/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Makefile 24 Apr 2004 18:31:44 -0000 1.5 +++ Makefile 11 May 2004 17:48:35 -0000 1.6 @@ -41,10 +41,10 @@ obj-$(CONFIG_E100) += e100.o obj-$(CONFIG_TLAN) += tlan.o obj-$(CONFIG_EPIC100) += epic100.o -obj-$(CONFIG_SIS190) += sis190.o obj-$(CONFIG_SIS900) += sis900.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 obj-$(CONFIG_STNIC) += stnic.o 8390.o @@ -175,6 +175,7 @@ obj-$(CONFIG_R8169) += r8169.o obj-$(CONFIG_AMD8111_ETH) += amd8111e.o obj-$(CONFIG_IBMVETH) += ibmveth.o +obj-$(CONFIG_S2IO) += s2io.o obj-$(CONFIG_GAMECUBE_NET) += gc-net.o obj-$(CONFIG_ARM) += arm/ |
