Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...

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

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index de4f9e1f2ca553e54483fd91a6258f245fc9a702..6e863aa9894c9ed4af4e89d9a56be08f3a00a541 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -24,6 +24,9 @@ config NETDEVICES
 
          If unsure, say Y.
 
+# All the following symbols are dependent on NETDEVICES - do not repeat
+# that for each of the symbols.
+if NETDEVICES
 
 config IFB
        tristate "Intermediate Functional Block support"
@@ -438,12 +441,6 @@ config MIPS_JAZZ_SONIC
          This is the driver for the onboard card of MIPS Magnum 4000,
          Acer PICA, Olivetti M700-10 and a few other identical OEM systems.
 
-config MIPS_GT96100ETH
-       bool "MIPS GT96100 Ethernet support"
-       depends on NET_ETHERNET && MIPS_GT96100
-       help
-         Say Y here to support the Ethernet subsystem on your GT96100 card.
-
 config MIPS_AU1X00_ENET
        bool "MIPS AU1000 Ethernet support"
        depends on NET_ETHERNET && SOC_AU1X00
@@ -489,7 +486,7 @@ config SGI_IOC3_ETH_HW_TX_CSUM
 
 config MIPS_SIM_NET
        tristate "MIPS simulator Network device (EXPERIMENTAL)"
-       depends on NETDEVICES && MIPS_SIM && EXPERIMENTAL
+       depends on MIPS_SIM && EXPERIMENTAL
        help
          The MIPSNET device is a simple Ethernet network device which is
          emulated by the MIPS Simulator.
@@ -1300,6 +1297,23 @@ config PCNET32
          <file:Documentation/networking/net-modules.txt>. The module
          will be called pcnet32.
 
+config PCNET32_NAPI
+       bool "Use RX polling (NAPI) (EXPERIMENTAL)"
+       depends on PCNET32 && 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.
+
+         See <file:Documentation/networking/NAPI_HOWTO.txt> for more
+         information.
+
+         If in doubt, say N.
+
 config AMD8111_ETH
        tristate "AMD 8111 (new PCI lance) support"
        depends on NET_PCI && PCI
@@ -2098,16 +2112,16 @@ config SKGE
 
 config SKY2
        tristate "SysKonnect Yukon2 support (EXPERIMENTAL)"
-       depends on PCI && EXPERIMENTAL
+       depends on PCI
        select CRC32
        ---help---
-         This driver supports Gigabit Ethernet adapters based on the the
+         This driver supports Gigabit Ethernet adapters based on the
          Marvell Yukon 2 chipset:
          Marvell 88E8021/88E8022/88E8035/88E8036/88E8038/88E8050/88E8052/
          88E8053/88E8055/88E8061/88E8062, SysKonnect SK-9E21D/SK-9S21
 
-         This driver does not support the original Yukon chipset: a seperate
-         driver, skge, is provided for Yukon-based adapters.
+         There is companion driver for the older Marvell Yukon and
+         Genesis based adapters: skge.
 
          To compile this driver as a module, choose M here: the module
          will be called sky2.  This is recommended.
@@ -2274,11 +2288,11 @@ config UGETH_TX_ON_DEMOND
 
 config UGETH_HAS_GIGA
        bool
-       depends on UCC_GETH && MPC836x
+       depends on UCC_GETH && PPC_MPC836x
 
 config MV643XX_ETH
        tristate "MV-643XX Ethernet support"
-       depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MOMENCO_OCELOT_3 || PPC_MULTIPLATFORM
+       depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MOMENCO_OCELOT_3 || (PPC_MULTIPLATFORM && PPC32)
        select MII
        help
          This driver supports the gigabit Ethernet on the Marvell MV643XX
@@ -2343,6 +2357,15 @@ config CHELSIO_T1
           To compile this driver as a module, choose M here: the module
           will be called cxgb.
 
+config EHEA
+       tristate "eHEA Ethernet support"
+       depends on IBMEBUS
+       ---help---
+         This driver supports the IBM pSeries eHEA ethernet adapter.
+
+         To compile the driver as a module, choose M here. The module
+         will be called ehea.
+
 config IXGB
        tristate "Intel(R) PRO/10GbE support"
        depends on PCI
@@ -2444,7 +2467,7 @@ config ISERIES_VETH
 
 config RIONET
        tristate "RapidIO Ethernet over messaging driver support"
-       depends on NETDEVICES && RAPIDIO
+       depends on RAPIDIO
 
 config RIONET_TX_SIZE
        int "Number of outbound queue entries"
@@ -2694,6 +2717,7 @@ config PPP_MPPE
        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.
@@ -2809,7 +2833,7 @@ config NET_FC
          "SCSI generic support".
 
 config SHAPER
-       tristate "Traffic Shaper (EXPERIMENTAL)"
+       tristate "Traffic Shaper (OBSOLETE)"
        depends on EXPERIMENTAL
        ---help---
          The traffic shaper is a virtual network device that allows you to
@@ -2818,9 +2842,9 @@ config SHAPER
          these virtual devices. See
          <file:Documentation/networking/shaper.txt> for more information.
 
-         An alternative to this traffic shaper is the experimental
-         Class-Based Queuing (CBQ) scheduling support which you get if you
-         say Y to "QoS and/or fair queuing" above.
+         An alternative to this traffic shaper are traffic schedulers which
+         you'll get if you say Y to "QoS and/or fair queuing" in
+         "Networking options".
 
          To compile this driver as a module, choose M here: the module
          will be called shaper.  If unsure, say N.
@@ -2832,6 +2856,8 @@ config NETCONSOLE
        If you want to log kernel messages over the network, enable this.
        See <file:Documentation/networking/netconsole.txt> for details.
 
+endif #NETDEVICES
+
 config NETPOLL
        def_bool NETCONSOLE