Menu
▾
▴
[Gc-linux-cvs] linux/drivers/net Kconfig,1.11,1.12 Makefile,1.11,1.12
|
From: <aot...@us...> - 2005-03-03 21:13:02
|
Update of /cvsroot/gc-linux/linux/drivers/net In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16634/drivers/net Modified Files: Kconfig Makefile Log Message: Merge 2.6.11 Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/net/Kconfig,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- Kconfig 4 Jan 2005 21:39:29 -0000 1.11 +++ Kconfig 3 Mar 2005 21:12:51 -0000 1.12 @@ -84,6 +84,7 @@ config TUN tristate "Universal TUN/TAP device driver support" depends on NETDEVICES + select CRC32 ---help--- TUN/TAP provides packet reception and transmission for user space programs. It can be viewed as a simple Point-to-Point or Ethernet @@ -697,6 +698,7 @@ config VORTEX tristate "3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" support" depends on NET_VENDOR_3COM && (PCI || EISA) + select MII ---help--- This option enables driver support for a large number of 10mbps and 10/100mbps EISA, PCI and PCMCIA 3Com network cards: @@ -1185,37 +1187,38 @@ be called ibmveth. config IBM_EMAC - tristate "IBM PPC4xx EMAC driver support" - depends on 4xx - ---help--- - This driver supports the IBM PPC4xx EMAC family of on-chip - Ethernet controllers. + tristate "IBM PPC4xx EMAC driver support" + depends on 4xx + select CRC32 + ---help--- + This driver supports the IBM PPC4xx EMAC family of on-chip + Ethernet controllers. config IBM_EMAC_ERRMSG - bool "Verbose error messages" - depends on IBM_EMAC + bool "Verbose error messages" + depends on IBM_EMAC config IBM_EMAC_RXB - int "Number of receive buffers" - depends on IBM_EMAC - default "128" if IBM_EMAC4 - default "64" + int "Number of receive buffers" + depends on IBM_EMAC + default "128" if IBM_EMAC4 + default "64" config IBM_EMAC_TXB - int "Number of transmit buffers" - depends on IBM_EMAC - default "128" if IBM_EMAC4 - default "8" + int "Number of transmit buffers" + depends on IBM_EMAC + default "128" if IBM_EMAC4 + default "8" config IBM_EMAC_FGAP - int "Frame gap" - depends on IBM_EMAC - default "8" + int "Frame gap" + depends on IBM_EMAC + default "8" config IBM_EMAC_SKBRES - int "Skb reserve amount" - depends on IBM_EMAC - default "0" + int "Skb reserve amount" + depends on IBM_EMAC + default "0" config NET_PCI bool "EISA, VLB, PCI and on board controllers" @@ -1404,16 +1407,6 @@ will be called eepro100. -config EEPRO100_PIO - bool "Use PIO instead of MMIO" if !X86_VISWS - depends on EEPRO100 - default y if X86_VISWS - help - This instructs the driver to use programmed I/O ports (PIO) instead - of PCI shared memory (MMIO). This can possibly solve some problems - in case your mainboard has memory consistency issues. If unsure, - say N. - config E100 tristate "Intel(R) PRO/100+ support" depends on NET_PCI && PCI @@ -1426,13 +1419,13 @@ Use the above information and the Adapter & Driver ID Guide at: - http://support.intel.com/support/network/adapter/pro100/21397.htm + <http://support.intel.com/support/network/adapter/pro100/21397.htm> to identify the adapter. For the latest Intel PRO/100 network driver for Linux, see: - http://appsr.intel.com/scripts-df/support_intel.asp + <http://appsr.intel.com/scripts-df/support_intel.asp> More specific information on configuring the driver is in <file:Documentation/networking/e100.txt>. @@ -1673,7 +1666,7 @@ <file:Documentation/networking/net-modules.txt>. The module will be called tlan. - Please email feedback to tor...@co.... + Please email feedback to <tor...@co...>. config VIA_RHINE tristate "VIA Rhine support" @@ -1985,6 +1978,15 @@ If in doubt, say N. +config R8169_VLAN + bool "VLAN support" + depends on R8169 && VLAN_8021Q + ---help--- + Say Y here for the r8169 driver to support the functions required + by the kernel 802.1Q code. + + If in doubt, say Y. + config SK98LIN tristate "Marvell Yukon Chipset / SysKonnect SK-98xx Support" depends on PCI @@ -2054,14 +2056,14 @@ The dual link adapters support link-failover and dual port features. Both Marvell Yukon and SysKonnect SK-98xx/SK-95xx adapters support the scatter-gather functionality with sendfile(). Please refer to - Documentation/networking/sk98lin.txt for more information about + <file:Documentation/networking/sk98lin.txt> for more information about optional driver parameters. Questions concerning this driver may be addressed to: - li...@sy... + <li...@sy...> If you want to compile this driver as a module ( = code which can be inserted in and removed from the running kernel whenever you want), - say M here and read Documentation/kbuild/modules.txt. The module will + say M here and read <file:Documentation/kbuild/modules.txt>. The module will be called sk98lin. This is recommended. config VIA_VELOCITY @@ -2197,6 +2199,17 @@ If in doubt, say N. +config 2BUFF_MODE + bool "Use 2 Buffer Mode on Rx side." + depends on S2IO + ---help--- + On enabling the 2 buffer mode, the received frame will be + split into 2 parts before being DMA'ed to the hosts memory. + The parts are the ethernet header and ethernet payload. + This is useful on systems where DMA'ing to to unaligned + physical memory loactions comes with a heavy price. + If not sure please say N. + endmenu source "drivers/net/tokenring/Kconfig" @@ -2259,7 +2272,7 @@ the driver. Questions concerning this driver can be addressed to: - li...@sy... + <li...@sy...> To compile this driver as a module, choose M here: the module will be called skfp. This is recommended. @@ -2455,7 +2468,7 @@ 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) + RoaringPenguin package (<http://www.roaringpenguin.com/pppoe>) which contains instruction on how to use this driver (under the heading "Kernel mode PPPoE"). @@ -2583,5 +2596,5 @@ depends on NETDEVICES && EXPERIMENTAL ---help--- If you want to log kernel messages over the network, enable this. - See Documentation/networking/netconsole.txt for details. + See <file:Documentation/networking/netconsole.txt> for details. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/net/Makefile,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- Makefile 4 Jan 2005 21:39:29 -0000 1.11 +++ Makefile 3 Mar 2005 21:12:52 -0000 1.12 @@ -66,7 +66,7 @@ obj-$(CONFIG_SUNDANCE) += sundance.o obj-$(CONFIG_HAMACHI) += hamachi.o -obj-$(CONFIG_NET) += Space.o net_init.o loopback.o +obj-$(CONFIG_NET) += Space.o loopback.o obj-$(CONFIG_SEEQ8005) += seeq8005.o obj-$(CONFIG_ETHERTAP) += ethertap.o obj-$(CONFIG_NET_SB1000) += sb1000.o |
