[PATCH] merge 2.6 backport of skge/sky2 network drivers

[linux-kernel-docs/linux-2.4.36.git] / Documentation / Configure.help

diff --git a/Documentation/Configure.help b/Documentation/Configure.help
index a54a4c2..0b76a36 100644 (file)
--- a/Documentation/Configure.help
+++ b/Documentation/Configure.help
@@ -6059,11 +6059,11 @@ CONFIG_IP_ADVANCED_ROUTER
   asymmetric routing (packets from you to a host take a different path
   than packets from that host to you) or if you operate a non-routing
   host which has several IP addresses on different interfaces. To turn
-  rp_filter off use:
+  rp_filter on use:
 
-        echo 0 > /proc/sys/net/ipv4/conf/<device>/rp_filter
-  or
-        echo 0 > /proc/sys/net/ipv4/conf/all/rp_filter
+        echo 1 > /proc/sys/net/ipv4/conf/<device>/rp_filter
+  and
+        echo 1 > /proc/sys/net/ipv4/conf/all/rp_filter
 
   If unsure, say N here.
 
@@ -8148,7 +8148,7 @@ CONFIG_AIC7XXX_DEBUG_ENABLE
 Debug code enable mask (2048 for all debugging)
 CONFIG_AIC7XXX_DEBUG_MASK
   Bit mask of debug options that is only valid if the
-  CONFIG_AIC7XXX_DEBUG_ENBLE option is enabled.  The bits in this mask
+  CONFIG_AIC7XXX_DEBUG_ENABLE option is enabled.  The bits in this mask
   are defined in the drivers/scsi/aic7xxx/aic7xxx.h - search for the
   variable ahc_debug in that file to find them.
 
@@ -8322,7 +8322,7 @@ CONFIG_AIC79XX_DEBUG_ENABLE
 
 CONFIG_AIC79XX_DEBUG_MASK
   Bit mask of debug options that is only valid if the
-  CONFIG_AIC79XX_DEBUG_ENBLE option is enabled.  The bits in this mask
+  CONFIG_AIC79XX_DEBUG_ENABLE option is enabled.  The bits in this mask
   are defined in the drivers/scsi/aic7xxx/aic79xx.h - search for the
   variable ahd_debug in that file to find them.
 
@@ -12140,6 +12140,37 @@ CONFIG_SK98LIN
   say M here and read Documentation/modules.txt. This is recommended.
   The module will be called sk98lin.o.
 
+Marvell Yukon Gigabit Ethernet Adapter family support
+CONFIG_SKGE
+  This is an alternate driver for the Marvell Yukon Gigabit Ethernet
+  family. It is a backport of version 1.6 for kernel 2.6. The vendor's
+  one is normally recommended (sk98lin), but under some circumstances, it
+  is known to have trouble (eg: sending UDP only on old chips). This driver
+  is not very fast an may lead to higher CPU loads than the original one
+  since it does not support NAPI yet, but at least it is reported to work
+  and is maintained in 2.6. Linking it with the kernel is not recommended
+  since it may conflict with sk98lin.
+
+  If you want to compile this driver as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want),
+  say M here and read Documentation/modules.txt. This is recommended.
+  The module will be called skge.o.
+
+Marvell Yukon 2 Gigabit Ethernet Adapter family support
+CONFIG_SKY2
+  This is an alternate driver for the Marvell Yukon 2 Gigabit Ethernet
+  family. It is a backport of version 1.5 for kernel 2.6. The vendor's
+  one is normally recommended (sk98lin), but under some circumstances, it
+  is known to have trouble (eg: sending UDP only on old chips). This driver
+  is not very fast an may lead to higher CPU loads than the original one
+  since it does not support NAPI yet, but at least it is reported to work
+  and is maintained in 2.6. Linking it with the kernel is not recommended
+  since it may conflict with sk98lin.
+
+  If you want to compile this driver as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want),
+  say M here and read Documentation/modules.txt. This is recommended.
+  The module will be called sky2.o.
 
 Sun GEM support
 CONFIG_SUNGEM