gianfar: delete non NAPI code from the driver.

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

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index d85b9d067597c62ec27cf188fbe93bca349d7334..1fe7e0792c1fd11e1e3a8515da7924db40d106ac 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -26,14 +26,6 @@ menuconfig 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
@@ -1306,20 +1298,6 @@ config AMD8111_ETH
          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
@@ -1334,20 +1312,6 @@ config ADAPTEC_STARFIRE
          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
@@ -1730,17 +1694,6 @@ config VIA_RHINE_MMIO
 
          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
@@ -2122,27 +2075,13 @@ config R8169
          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.
-         
+
          If in doubt, say Y.
 
 config SB1250_MAC
@@ -2323,10 +2262,6 @@ config GIANFAR
          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
@@ -2428,14 +2363,6 @@ config CHELSIO_T1_1G
           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"
        depends on PCI && INET
@@ -2529,20 +2456,6 @@ config S2IO
          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