2 files changed, 11 insertions, 4 deletions

diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index f12007b80a46..d46338af6002 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -362,6 +362,13 @@ tcp_workaround_signed_windows - BOOLEAN
         not receive a window scaling option from them.
         Default: 0
 
+tcp_slow_start_after_idle - BOOLEAN
+        If set, provide RFC2861 behavior and time out the congestion
+        window after an idle period.  An idle period is defined at
+        the current RTO.  If unset, the congestion window will not
+        be timed out after an idle period.
+        Default: 1
+
 IP Variables:
 
 ip_local_port_range - 2 INTEGERS
diff --git a/Documentation/networking/netdevices.txt b/Documentation/networking/netdevices.txt
index 3c0a5ba614d7..847cedb238f6 100644
--- a/Documentation/networking/netdevices.txt
+++ b/Documentation/networking/netdevices.txt
@@ -42,9 +42,9 @@ dev->get_stats:
         Context: nominally process, but don't sleep inside an rwlock
 
 dev->hard_start_xmit:
-        Synchronization: dev->xmit_lock spinlock.
+        Synchronization: netif_tx_lock spinlock.
         When the driver sets NETIF_F_LLTX in dev->features this will be
-        called without holding xmit_lock. In this case the driver 
+        called without holding netif_tx_lock. In this case the driver
         has to lock by itself when needed. It is recommended to use a try lock
         for this and return -1 when the spin lock fails. 
         The locking there should also properly protect against 
@@ -62,12 +62,12 @@ dev->hard_start_xmit:
           Only valid when NETIF_F_LLTX is set.
 
 dev->tx_timeout:
-        Synchronization: dev->xmit_lock spinlock.
+        Synchronization: netif_tx_lock spinlock.
         Context: BHs disabled
         Notes: netif_queue_stopped() is guaranteed true
 
 dev->set_multicast_list:
-        Synchronization: dev->xmit_lock spinlock.
+        Synchronization: netif_tx_lock spinlock.
         Context: BHs disabled
 
 dev->poll: