3 files changed, 28 insertions, 3 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index d1cd5f93e028..552507fe9a7e 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -281,3 +281,16 @@ Why:	The deferred output hooks are a layering violation causing unusual
 Who:    Patrick McHardy <kaber@trash.net>
 
 ---------------------------
+
+What:   frame diverter
+When:   November 2006
+Why:    The frame diverter is included in most distribution kernels, but is
+        broken. It does not correctly handle many things:
+        - IPV6
+        - non-linear skb's
+        - network device RCU on removal
+        - input frames not correctly checked for protocol errors
+        It also adds allocation overhead even if not enabled.
+        It is not clear if anyone is still using it.
+Who:    Stephen Hemminger <shemminger@osdl.org>
+
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 7947cede8712..87a17337c7f6 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -697,6 +697,12 @@ running once the system is up.
         ips=            [HW,SCSI] Adaptec / IBM ServeRAID controller
                         See header of drivers/scsi/ips.c.
 
+        ports=          [IP_VS_FTP] IPVS ftp helper module
+                        Default is 21.
+                        Up to 8 (IP_VS_APP_MAX_PORTS) ports
+                        may be specified.
+                        Format: <port>,<port>....
+
         irqfixup        [HW]
                         When an interrupt is not handled search all handlers
                         for it. Intended to get systems with badly broken
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index 3e0c017e7877..90ed78110fd4 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -102,9 +102,15 @@ inet_peer_gc_maxtime - INTEGER
 TCP variables: 
 
 tcp_abc - INTEGER
-        Controls Appropriate Byte Count defined in RFC3465. If set to
-        0 then does congestion avoid once per ack. 1 is conservative
-        value, and 2 is more agressive.
+        Controls Appropriate Byte Count (ABC) defined in RFC3465.
+        ABC is a way of increasing congestion window (cwnd) more slowly
+        in response to partial acknowledgments.
+        Possible values are:
+                0 increase cwnd once per acknowledgment (no ABC)
+                1 increase cwnd once per acknowledgment of full sized segment
+                2 allow increase cwnd by two if acknowledgment is
+                  of two segments to compensate for delayed acknowledgments.
+        Default: 0 (off)
 
 tcp_syn_retries - INTEGER
         Number of times initial SYNs for an active TCP connection attempt