Merge pobox.com:/spare/repo/linux-2.6

into pobox.com:/spare/repo/netdev-2.6/r8169

Merge pobox.com:/spare/repo/linux-2.6
into pobox.com:/spare/repo/netdev-2.6/r8169
61304905 · Jeff Garzik · 004a3668 · d15947f4 · 61304905 · 61304905
Commit 61304905 authored Jul 02, 2004 by Jeff Garzik
Expand all Show whitespace changes
Inline Side-by-side

Showing with 456 additions and 202 deletions

drivers/net/Kconfig drivers/net/Kconfig +5 -0

drivers/net/r8169.c drivers/net/r8169.c +451 -202

No files found.
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2043,6 +2043,11 @@ 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 and Tx Polling (NAPI) (EXPERIMENTAL)"
+	depends on R8169 && EXPERIMENTAL 
 config SK98LIN
 	tristate "Marvell Yukon Chipset / SysKonnect SK-98xx Support"
 	depends on PCI

--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c