diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-20 05:35:20 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-20 05:35:20 +0200 |
commit | 9abbf7d028b1598b40ebdc81c48f30da7f3d5bf5 (patch) | |
tree | 61a56ec39f4b7d438d7e08fc3f32d636828d9f7a /drivers/net/tulip | |
parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff) | |
parent | Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
download | linux-9abbf7d028b1598b40ebdc81c48f30da7f3d5bf5.tar.xz linux-9abbf7d028b1598b40ebdc81c48f30da7f3d5bf5.zip |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (21 commits)
Fix build break in tsi108.c
qeth: remove header_ops bug
ir-functions.c:(.text+0xbce18): undefined reference to `input_event'
NAPI: kconfig prompt and deleted doc file
phy/bitbang: missing MODULE_LICENSE
DM9000 initialization fix
[PATCH] rt2x00: Add new rt73usb USB ID
[PATCH] rt2x00: Fix residual check in PLCP calculations.
[PATCH] iwlwifi: Fix rate setting in probe request for HW sacn
[PATCH] b43: Make b43_stop() static
[PATCH] drivers/net/wireless/b43/main.c: fix an uninitialized variable
[PATCH] iwlwifi: set correct base rate for A band in rs_dbgfs_set_mcs
[PATCH] zd1211rw, fix oops when ejecting install media
[PATCH] b43legacy: Fix potential return of uninitialized variable
[PATCH] iwl4965-base.c: fix off-by-one errors
[PATCH] p54: Make filter configuration atomic
[PATCH] rtl8187: remove NICMAC setting in configure_filters callback
[PATCH] janitorial: fix all double includes in drivers/net/wireless
[PATCH] rtl8187: Fix more frag bit checking, rts duration calc
[PATCH] ipw2100: send WEXT scan events
...
Diffstat (limited to 'drivers/net/tulip')
-rw-r--r-- | drivers/net/tulip/Kconfig | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/net/tulip/Kconfig b/drivers/net/tulip/Kconfig index 1c537d5a3062..49d7a290dbbc 100644 --- a/drivers/net/tulip/Kconfig +++ b/drivers/net/tulip/Kconfig @@ -67,7 +67,7 @@ config TULIP_MMIO If in doubt, say N. config TULIP_NAPI - bool "Use NAPI RX polling " + bool "Use RX polling (NAPI)" depends on TULIP help NAPI is a new driver API designed to reduce CPU and interrupt load @@ -78,18 +78,16 @@ config TULIP_NAPI 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 TULIP_NAPI_HW_MITIGATION - bool "Use Interrupt Mitigation " + bool "Use Interrupt Mitigation" depends on TULIP_NAPI ---help--- - Use HW to reduce RX interrupts. Not strict necessary since NAPI reduces - RX interrupts but itself. Although this reduces RX interrupts even at - low levels traffic at the cost of a small latency. + Use HW to reduce RX interrupts. Not strictly necessary since NAPI + reduces RX interrupts by itself. Interrupt mitigation reduces RX + interrupts even at low levels of traffic at the cost of a small + latency. If in doubt, say Y. |