Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index f4182cfffe9d4c62c02b64b14d17d252a87dc6d7..3e5e64c33e186779c8820959cd9a4f19ac769992 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -26,14 +26,6 @@ menuconfig NETDEVICES
 # that for each of the symbols.
 if NETDEVICES
 
 # that for each of the symbols.
 if NETDEVICES
 

-config NETDEVICES_MULTIQUEUE
-       bool "Netdevice multiple hardware queue support"
-       ---help---
-         Say Y here if you want to allow the network stack to use multiple
-         hardware TX queues on an ethernet device.
-
-         Most people will say N here.
-

 config IFB
        tristate "Intermediate Functional Block support"
        depends on NET_CLS_ACT
 config IFB
        tristate "Intermediate Functional Block support"
        depends on NET_CLS_ACT


@@ -217,7 +209,7 @@ config MII
 
 config MACB
        tristate "Atmel MACB support"
 
 config MACB
        tristate "Atmel MACB support"

-       depends on AVR32 || ARCH_AT91SAM9260 || ARCH_AT91SAM9263 || ARCH_AT91CAP9
+       depends on AVR32 || ARCH_AT91SAM9260 || ARCH_AT91SAM9263 || ARCH_AT91SAM9G20 || ARCH_AT91CAP9

        select PHYLIB
        help
          The Atmel MACB ethernet interface is found on many AT32 and AT91
        select PHYLIB
        help
          The Atmel MACB ethernet interface is found on many AT32 and AT91


@@ -333,15 +325,6 @@ config APNE
          To compile this driver as a module, choose M here: the module
          will be called apne.
 
          To compile this driver as a module, choose M here: the module
          will be called apne.
 

-config APOLLO_ELPLUS
-       tristate "Apollo 3c505 support"
-       depends on APOLLO
-       help
-         Say Y or M here if your Apollo has a 3Com 3c505 ISA Ethernet card.
-         If you don't have one made for Apollos, you can use one from a PC,
-         except that your Apollo won't be able to boot from it (because the
-         code in the ROM will be for a PC).
-

 config MAC8390
        bool "Macintosh NS 8390 based ethernet cards"
        depends on MAC
 config MAC8390
        bool "Macintosh NS 8390 based ethernet cards"
        depends on MAC


@@ -524,6 +507,18 @@ config STNIC
 
          If unsure, say N.
 
 
          If unsure, say N.
 

+config SH_ETH
+       tristate "Renesas SuperH Ethernet support"
+       depends on SUPERH && \
+               (CPU_SUBTYPE_SH7710 || CPU_SUBTYPE_SH7712)
+       select CRC32
+       select MII
+       select MDIO_BITBANG
+       select PHYLIB
+       help
+         Renesas SuperH Ethernet device driver.
+         This driver support SH7710 and SH7712.
+

 config SUNLANCE
        tristate "Sun LANCE support"
        depends on SBUS
 config SUNLANCE
        tristate "Sun LANCE support"
        depends on SBUS


@@ -926,6 +921,23 @@ config DM9000
          To compile this driver as a module, choose M here.  The module
          will be called dm9000.
 
          To compile this driver as a module, choose M here.  The module
          will be called dm9000.
 

+config DM9000_DEBUGLEVEL
+       int "DM9000 maximum debug level"
+       depends on DM9000
+       default 4
+       help
+         The maximum level of debugging code compiled into the DM9000
+         driver.
+
+config DM9000_FORCE_SIMPLE_PHY_POLL
+       bool "Force simple NSR based PHY polling"
+       depends on DM9000
+       ---help---
+         This configuration forces the DM9000 to use the NSR's LinkStatus
+         bit to determine if the link is up or down instead of the more
+         costly MII PHY reads. Note, this will not work if the chip is
+         operating with an external PHY.
+

 config ENC28J60
        tristate "ENC28J60 support"
        depends on EXPERIMENTAL && SPI && NET_ETHERNET
 config ENC28J60
        tristate "ENC28J60 support"
        depends on EXPERIMENTAL && SPI && NET_ETHERNET


@@ -943,19 +955,11 @@ config ENC28J60_WRITEVERIFY
          Enable the verify after the buffer write useful for debugging purpose.
          If unsure, say N.
 
          Enable the verify after the buffer write useful for debugging purpose.
          If unsure, say N.
 

-config DM9000_DEBUGLEVEL
-       int "DM9000 maximum debug level"
-       depends on DM9000
-       default 4
-       help
-         The maximum level of debugging code compiled into the DM9000
-         driver.
-

 config SMC911X
        tristate "SMSC LAN911[5678] support"
        select CRC32
        select MII
 config SMC911X
        tristate "SMSC LAN911[5678] support"
        select CRC32
        select MII

-       depends on ARCH_PXA || SH_MAGIC_PANEL_R2
+       depends on ARCH_PXA || SUPERH

        help
          This is a driver for SMSC's LAN911x series of Ethernet chipsets
          including the new LAN9115, LAN9116, LAN9117, and LAN9118.
        help
          This is a driver for SMSC's LAN911x series of Ethernet chipsets
          including the new LAN9115, LAN9116, LAN9117, and LAN9118.


@@ -1243,7 +1247,6 @@ config IBMVETH
          To compile this driver as a module, choose M here. The module will
          be called ibmveth.
 
          To compile this driver as a module, choose M here. The module will
          be called ibmveth.
 

-source "drivers/net/ibm_emac/Kconfig"

 source "drivers/net/ibm_newemac/Kconfig"
 
 config NET_PCI
 source "drivers/net/ibm_newemac/Kconfig"
 
 config NET_PCI


@@ -1286,20 +1289,6 @@ config AMD8111_ETH
          To compile this driver as a module, choose M here. The module
          will be called amd8111e.
 
          To compile this driver as a module, choose M here. The module
          will be called amd8111e.
 

-config AMD8111E_NAPI
-       bool "Use RX polling (NAPI)"
-       depends on AMD8111_ETH
-       help
-         NAPI is a new driver API designed to reduce CPU and interrupt load
-         when the driver is receiving lots of packets from the card. It is
-         still somewhat experimental and thus not yet enabled by default.
-
-         If your estimated Rx load is 10kpps or more, or if the card will be
-         deployed on potentially unfriendly networks (e.g. in a firewall),
-         then say Y here.
-
-         If in doubt, say N.
-

 config ADAPTEC_STARFIRE
        tristate "Adaptec Starfire/DuraLAN support"
        depends on NET_PCI && PCI
 config ADAPTEC_STARFIRE
        tristate "Adaptec Starfire/DuraLAN support"
        depends on NET_PCI && PCI


@@ -1314,20 +1303,6 @@ config ADAPTEC_STARFIRE
          To compile this driver as a module, choose M here: the module
          will be called starfire.  This is recommended.
 
          To compile this driver as a module, choose M here: the module
          will be called starfire.  This is recommended.
 

-config ADAPTEC_STARFIRE_NAPI
-       bool "Use Rx Polling (NAPI) (EXPERIMENTAL)"
-       depends on ADAPTEC_STARFIRE && EXPERIMENTAL
-       help
-         NAPI is a new driver API designed to reduce CPU and interrupt load
-         when the driver is receiving lots of packets from the card. It is
-         still somewhat experimental and thus not yet enabled by default.
-
-         If your estimated Rx load is 10kpps or more, or if the card will be
-         deployed on potentially unfriendly networks (e.g. in a firewall),
-         then say Y here.
-
-         If in doubt, say N.
-

 config AC3200
        tristate "Ansel Communications EISA 3200 support (EXPERIMENTAL)"
        depends on NET_PCI && (ISA || EISA) && EXPERIMENTAL
 config AC3200
        tristate "Ansel Communications EISA 3200 support (EXPERIMENTAL)"
        depends on NET_PCI && (ISA || EISA) && EXPERIMENTAL


@@ -1670,7 +1645,7 @@ config SUNDANCE_MMIO
 
 config TLAN
        tristate "TI ThunderLAN support"
 
 config TLAN
        tristate "TI ThunderLAN support"

-       depends on NET_PCI && (PCI || EISA) && !64BIT
+       depends on NET_PCI && (PCI || EISA)

        ---help---
          If you have a PCI Ethernet network card based on the ThunderLAN chip
          which is supported by this driver, say Y and read the
        ---help---
          If you have a PCI Ethernet network card based on the ThunderLAN chip
          which is supported by this driver, say Y and read the


@@ -1710,26 +1685,6 @@ config VIA_RHINE_MMIO
 
          If unsure, say Y.
 
 
          If unsure, say Y.
 

-config VIA_RHINE_NAPI
-       bool "Use Rx Polling (NAPI)"
-       depends on VIA_RHINE
-       help
-         NAPI is a new driver API designed to reduce CPU and interrupt load
-         when the driver is receiving lots of packets from the card.
-
-         If your estimated Rx load is 10kpps or more, or if the card will be
-         deployed on potentially unfriendly networks (e.g. in a firewall),
-         then say Y here.
-
-config LAN_SAA9730
-       bool "Philips SAA9730 Ethernet support"
-       depends on NET_PCI && PCI && MIPS_ATLAS
-       help
-         The SAA9730 is a combined multimedia and peripheral controller used
-         in thin clients, Internet access terminals, and diskless
-         workstations.
-         See <http://www.semiconductors.philips.com/pip/SAA9730_flyer_1>.
-

 config SC92031
        tristate "Silan SC92031 PCI Fast Ethernet Adapter driver (EXPERIMENTAL)"
        depends on NET_PCI && PCI && EXPERIMENTAL
 config SC92031
        tristate "Silan SC92031 PCI Fast Ethernet Adapter driver (EXPERIMENTAL)"
        depends on NET_PCI && PCI && EXPERIMENTAL


@@ -1884,7 +1839,6 @@ config NE_H8300
          Say Y here if you want to use the NE2000 compatible
          controller on the Renesas H8/300 processor.
 
          Say Y here if you want to use the NE2000 compatible
          controller on the Renesas H8/300 processor.
 

-source "drivers/net/fec_8xx/Kconfig"

 source "drivers/net/fs_enet/Kconfig"
 
 endif # NET_ETHERNET
 source "drivers/net/fs_enet/Kconfig"
 
 endif # NET_ETHERNET


@@ -2014,9 +1968,6 @@ config E1000E
          To compile this driver as a module, choose M here. The module
          will be called e1000e.
 
          To compile this driver as a module, choose M here. The module
          will be called e1000e.
 

-config E1000E_ENABLED
-       def_bool E1000E != n
-

 config IP1000
        tristate "IP1000 Gigabit Ethernet support"
        depends on PCI && EXPERIMENTAL
 config IP1000
        tristate "IP1000 Gigabit Ethernet support"
        depends on PCI && EXPERIMENTAL


@@ -2048,6 +1999,15 @@ config IGB
          To compile this driver as a module, choose M here. The module
          will be called igb.
 
          To compile this driver as a module, choose M here. The module
          will be called igb.
 

+config IGB_LRO 
+       bool "Use software LRO"
+       depends on IGB && INET
+       select INET_LRO
+       ---help---
+         Say Y here if you want to use large receive offload. 
+
+         If in doubt, say N.
+

 source "drivers/net/ixp2000/Kconfig"
 
 config MYRI_SBUS
 source "drivers/net/ixp2000/Kconfig"
 
 config MYRI_SBUS


@@ -2105,27 +2065,13 @@ config R8169
          To compile this driver as a module, choose M here: the module
          will be called r8169.  This is recommended.
 
          To compile this driver as a module, choose M here: the module
          will be called r8169.  This is recommended.
 

-config R8169_NAPI
-       bool "Use Rx Polling (NAPI) (EXPERIMENTAL)"
-       depends on R8169 && EXPERIMENTAL
-       help
-         NAPI is a new driver API designed to reduce CPU and interrupt load
-         when the driver is receiving lots of packets from the card. It is
-         still somewhat experimental and thus not yet enabled by default.
-
-         If your estimated Rx load is 10kpps or more, or if the card will be
-         deployed on potentially unfriendly networks (e.g. in a firewall),
-         then say Y here.
-
-         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.
 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 SB1250_MAC
          If in doubt, say Y.
 
 config SB1250_MAC


@@ -2228,6 +2174,7 @@ config VIA_VELOCITY
 config TIGON3
        tristate "Broadcom Tigon3 support"
        depends on PCI
 config TIGON3
        tristate "Broadcom Tigon3 support"
        depends on PCI

+       select PHYLIB

        help
          This driver supports Broadcom Tigon3 based gigabit Ethernet cards.
 
        help
          This driver supports Broadcom Tigon3 based gigabit Ethernet cards.
 


@@ -2283,6 +2230,19 @@ config GELIC_WIRELESS
          the driver automatically distinguishes the models, you can
          safely enable this option even if you have a wireless-less model.
 
          the driver automatically distinguishes the models, you can
          safely enable this option even if you have a wireless-less model.
 

+config GELIC_WIRELESS_OLD_PSK_INTERFACE
+       bool "PS3 Wireless private PSK interface (OBSOLETE)"
+       depends on GELIC_WIRELESS
+       help
+          This option retains the obsolete private interface to pass
+          the PSK from user space programs to the driver.  The PSK
+          stands for 'Pre Shared Key' and is used for WPA[2]-PSK
+          (WPA-Personal) environment.
+          If WPA[2]-PSK is used and you need to use old programs that
+          support only this old interface, say Y.  Otherwise N.
+
+          If unsure, say N.
+

 config GIANFAR
        tristate "Gianfar Ethernet"
        depends on FSL_SOC
 config GIANFAR
        tristate "Gianfar Ethernet"
        depends on FSL_SOC


@@ -2292,10 +2252,6 @@ config GIANFAR
          This driver supports the Gigabit TSEC on the MPC83xx, MPC85xx,
          and MPC86xx family of chips, and the FEC on the 8540.
 
          This driver supports the Gigabit TSEC on the MPC83xx, MPC85xx,
          and MPC86xx family of chips, and the FEC on the 8540.
 

-config GFAR_NAPI
-       bool "Use Rx Polling (NAPI)"
-       depends on GIANFAR
-

 config UCC_GETH
        tristate "Freescale QE Gigabit Ethernet"
        depends on QUICC_ENGINE
 config UCC_GETH
        tristate "Freescale QE Gigabit Ethernet"
        depends on QUICC_ENGINE


@@ -2304,10 +2260,6 @@ config UCC_GETH
          This driver supports the Gigabit Ethernet mode of the QUICC Engine,
          which is available on some Freescale SOCs.
 
          This driver supports the Gigabit Ethernet mode of the QUICC Engine,
          which is available on some Freescale SOCs.
 

-config UGETH_NAPI
-       bool "Use Rx Polling (NAPI)"
-       depends on UCC_GETH
-

 config UGETH_MAGIC_PACKET
        bool "Magic Packet detection support"
        depends on UCC_GETH
 config UGETH_MAGIC_PACKET
        bool "Magic Packet detection support"
        depends on UCC_GETH


@@ -2397,18 +2349,11 @@ config CHELSIO_T1_1G
           Enables support for Chelsio's gigabit Ethernet PCI cards.  If you
           are using only 10G cards say 'N' here.
 
           Enables support for Chelsio's gigabit Ethernet PCI cards.  If you
           are using only 10G cards say 'N' here.
 

-config CHELSIO_T1_NAPI
-       bool "Use Rx Polling (NAPI)"
-       depends on CHELSIO_T1
-       default y
-       help
-         NAPI is a driver API designed to reduce CPU and interrupt load
-         when the driver is receiving lots of packets from the card.
-

 config CHELSIO_T3
        tristate "Chelsio Communications T3 10Gb Ethernet support"
 config CHELSIO_T3
        tristate "Chelsio Communications T3 10Gb Ethernet support"

-       depends on PCI
+       depends on PCI && INET

        select FW_LOADER
        select FW_LOADER

+       select INET_LRO

        help
          This driver supports Chelsio T3-based gigabit and 10Gb Ethernet
          adapters.
        help
          This driver supports Chelsio T3-based gigabit and 10Gb Ethernet
          adapters.


@@ -2436,7 +2381,8 @@ config EHEA
 
 config IXGBE
        tristate "Intel(R) 10GbE PCI Express adapters support"
 
 config IXGBE
        tristate "Intel(R) 10GbE PCI Express adapters support"

-       depends on PCI
+       depends on PCI && INET
+       select INET_LRO

        ---help---
          This driver supports Intel(R) 10GbE PCI Express family of
          adapters.  For more information on how to identify your adapter, go
        ---help---
          This driver supports Intel(R) 10GbE PCI Express family of
          adapters.  For more information on how to identify your adapter, go


@@ -2474,20 +2420,6 @@ config IXGB
          To compile this driver as a module, choose M here. The module
          will be called ixgb.
 
          To compile this driver as a module, choose M here. The module
          will be called ixgb.
 

-config IXGB_NAPI
-       bool "Use Rx Polling (NAPI) (EXPERIMENTAL)"
-       depends on IXGB && EXPERIMENTAL
-       help
-         NAPI is a new driver API designed to reduce CPU and interrupt load
-         when the driver is receiving lots of packets from the card. It is
-         still somewhat experimental and thus not yet enabled by default.
-
-         If your estimated Rx load is 10kpps or more, or if the card will be
-         deployed on potentially unfriendly networks (e.g. in a firewall),
-         then say Y here.
-
-         If in doubt, say N.
-

 config S2IO
        tristate "S2IO 10Gbe XFrame NIC"
        depends on PCI
 config S2IO
        tristate "S2IO 10Gbe XFrame NIC"
        depends on PCI


@@ -2496,20 +2428,6 @@ config S2IO
          More specific information on configuring the driver is in 
          <file:Documentation/networking/s2io.txt>.
 
          More specific information on configuring the driver is in 
          <file:Documentation/networking/s2io.txt>.
 

-config S2IO_NAPI
-       bool "Use Rx Polling (NAPI) (EXPERIMENTAL)"
-       depends on S2IO && EXPERIMENTAL
-       help
-         NAPI is a new driver API designed to reduce CPU and interrupt load
-         when the driver is receiving lots of packets from the card. It is
-         still somewhat experimental and thus not yet enabled by default.
-
-         If your estimated Rx load is 10kpps or more, or if the card will be
-         deployed on potentially unfriendly networks (e.g. in a firewall),
-         then say Y here.
-
-         If in doubt, say N.
-

 config MYRI10GE
        tristate "Myricom Myri-10G Ethernet support"
        depends on PCI && INET
 config MYRI10GE
        tristate "Myricom Myri-10G Ethernet support"
        depends on PCI && INET


@@ -2574,6 +2492,7 @@ config BNX2X
        tristate "Broadcom NetXtremeII 10Gb support"
        depends on PCI
        select ZLIB_INFLATE
        tristate "Broadcom NetXtremeII 10Gb support"
        depends on PCI
        select ZLIB_INFLATE

+       select LIBCRC32C

        help
          This driver supports Broadcom NetXtremeII 10 gigabit Ethernet cards.
          To compile this driver as a module, choose M here: the module
        help
          This driver supports Broadcom NetXtremeII 10 gigabit Ethernet cards.
          To compile this driver as a module, choose M here: the module