diff options
| author | Francois Romieu <romieu@fr.zoreil.com> | 2008-07-07 05:50:16 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-08 07:40:26 +0200 |
| commit | 6a3d8aa48c1c9d3afc761b862267b9945cc6f281 (patch) | |
| tree | 882ddbfed854123db6def74f7885bf779560c0e7 | |
| parent | netdrv: don't truncate VLAN TCI with VLAN stripping (diff) | |
| download | linux-6a3d8aa48c1c9d3afc761b862267b9945cc6f281.tar.xz linux-6a3d8aa48c1c9d3afc761b862267b9945cc6f281.zip | |
netdev: remove unused S2IO_NAPI
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Acked-by: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | Documentation/networking/s2io.txt | 7 | ||||
| -rw-r--r-- | drivers/net/Kconfig | 14 |
2 files changed, 2 insertions, 19 deletions
diff --git a/Documentation/networking/s2io.txt b/Documentation/networking/s2io.txt index 1e28e2ddb90a..c3d6b4d5d014 100644 --- a/Documentation/networking/s2io.txt +++ b/Documentation/networking/s2io.txt @@ -52,13 +52,10 @@ d. MSI/MSI-X. Can be enabled on platforms which support this feature (IA64, Xeon) resulting in noticeable performance improvement(upto 7% on certain platforms). -e. NAPI. Compile-time option(CONFIG_S2IO_NAPI) for better Rx interrupt -moderation. - -f. Statistics. Comprehensive MAC-level and software statistics displayed +e. Statistics. Comprehensive MAC-level and software statistics displayed using "ethtool -S" option. -g. Multi-FIFO/Ring. Supports up to 8 transmit queues and receive rings, +f. Multi-FIFO/Ring. Supports up to 8 transmit queues and receive rings, with multiple steering options. 4. Command line parameters diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 84925915dce4..1fe47a3bb6f5 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -2515,20 +2515,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 |