lkml.org 
[lkml]   [2004]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [2.6 patch] add NAPI help texts
On Tue, Jun 08, 2004 at 02:35:59PM -0400, Jeff Garzik wrote:

> patch OK, but doesn't apply cleanly

I made the patch against -mm.

Hunk #5 of the first file doesn't apply, since R8169_NAPI was added in
-mm.

Below is the same patch with the R8169_NAPI help text removed (applies
with a few lines offset against 2.6.7-rc3).

cu
Adrian

<-- snip -->

NAPI seems to be so self-explaining that no help texts are needed. ;-)

I combined the two help texts that were at NAPI options, and added them
to all NAPI options.

diffstat output:
drivers/net/Kconfig | 70 ++++++++++++++++++++++++++++++++++++++
drivers/net/tulip/Kconfig | 16 +++++---
2 files changed, 81 insertions(+), 5 deletions(-)


--- linux-2.6.7-rc2-mm2-full/drivers/net/Kconfig.old 2004-06-04 17:10:43.000000000 +0200
+++ linux-2.6.7-rc2-mm2-full/drivers/net/Kconfig 2004-06-04 17:18:14.000000000 +0200
@@ -1237,6 +1237,19 @@
config AMD8111E_NAPI
bool "Enable NAPI support"
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.
+
+ See <file:Documentation/networking/NAPI_HOWTO.txt> for more
+ information.
+
+ If in doubt, say N.

config ADAPTEC_STARFIRE
tristate "Adaptec Starfire/DuraLAN support"
@@ -1264,6 +1277,11 @@
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 AC3200
tristate "Ansel Communications EISA 3200 support (EXPERIMENTAL)"
depends on NET_PCI && (ISA || EISA) && EXPERIMENTAL
@@ -1451,6 +1469,19 @@
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)"
@@ -1924,6 +1955,19 @@
config E1000_NAPI
bool "Use Rx Polling (NAPI)"
depends on E1000
+ 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 MYRI_SBUS
tristate "MyriCOM Gigabit Ethernet support"
@@ -2114,6 +2170,19 @@
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.
+
+ See <file:Documentation/networking/NAPI_HOWTO.txt> for more
+ information.
+
+ If in doubt, say N.

config S2IO
tristate "S2IO 10Gbe XFrame NIC"
@@ -2126,6 +2195,19 @@
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.
+
+ See <file:Documentation/networking/NAPI_HOWTO.txt> for more
+ information.
+
+ If in doubt, say N.

endmenu

--- linux-2.6.7-rc2-mm2-full/drivers/net/tulip/Kconfig.old 2004-06-04 17:14:18.000000000 +0200
+++ linux-2.6.7-rc2-mm2-full/drivers/net/tulip/Kconfig 2004-06-04 17:16:07.000000000 +0200
@@ -71,10 +71,17 @@
config TULIP_NAPI
bool "Use NAPI RX polling "
depends on TULIP
- ---help---
- This is of useful for servers and routers dealing with high network loads.
-
- See <file:Documentation/networking/NAPI_HOWTO.txt>.
+ 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.

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-03-22 14:03    [W:0.066 / U:0.396 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site