summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Feldman <sfeldma@pobox.com>2005-03-02 13:57:27 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-03-02 13:57:27 -0500
commit0943fd4a90e718920819cd8f5efa6a25e4d90d8b (patch)
tree67badbbde706394785838956f16f038e478c8fb7
parent1274fcd685ec15f10261f48dc990367c2180d589 (diff)
[PATCH] e100: remove reference to NAPI config option
e100 is NAPI all the time, so the Kconfig option is wasting space. Signed-off-by: Scott Feldman <sfeldma@pobox.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
-rw-r--r--Documentation/networking/e100.txt3
-rw-r--r--drivers/net/Kconfig17
2 files changed, 1 insertions, 19 deletions
diff --git a/Documentation/networking/e100.txt b/Documentation/networking/e100.txt
index df7246947858..4ef9f7cd5dc3 100644
--- a/Documentation/networking/e100.txt
+++ b/Documentation/networking/e100.txt
@@ -140,8 +140,7 @@ Additional Configurations
NAPI
----
- NAPI (Rx polling mode) is supported in the e100 driver. NAPI is enabled
- or disabled based on the configuration of the kernel.
+ NAPI (Rx polling mode) is supported in the e100 driver.
See www.cyberus.ca/~hadi/usenix-paper.tgz for more information on NAPI.
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index fd2a9290bc9b..2c9834ddcfa7 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1428,23 +1428,6 @@ config E100
<file:Documentation/networking/net-modules.txt>. The module
will be called e100.
-config E100_NAPI
- bool "Use Rx Polling (NAPI)"
- depends on E100
- 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 LNE390
tristate "Mylex EISA LNE390A/B support (EXPERIMENTAL)"
depends on NET_PCI && EISA && EXPERIMENTAL