1 files changed, 16 insertions, 19 deletions

diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index bfe924217f2..ca5cdcd0f0e 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -106,16 +106,6 @@ inet_peer_maxttl - INTEGER
         when the number of entries in the pool is very small).
         Measured in seconds.
 
-inet_peer_gc_mintime - INTEGER
-        Minimum interval between garbage collection passes.  This interval is
-        in effect under high memory pressure on the pool.
-        Measured in seconds.
-
-inet_peer_gc_maxtime - INTEGER
-        Minimum interval between garbage collection passes.  This interval is
-        in effect under low (or absent) memory pressure on the pool.
-        Measured in seconds.
-
 TCP variables:
 
 somaxconn - INTEGER
@@ -394,7 +384,7 @@ tcp_rmem - vector of 3 INTEGERs: min, default, max
         min: Minimal size of receive buffer used by TCP sockets.
         It is guaranteed to each TCP socket, even under moderate memory
         pressure.
-        Default: 8K
+        Default: 1 page
 
         default: initial size of receive buffer used by TCP sockets.
         This value overrides net.core.rmem_default used by other protocols.
@@ -483,7 +473,7 @@ tcp_window_scaling - BOOLEAN
 tcp_wmem - vector of 3 INTEGERs: min, default, max
         min: Amount of memory reserved for send buffers for TCP sockets.
         Each TCP socket has rights to use it due to fact of its birth.
-        Default: 4K
+        Default: 1 page
 
         default: initial size of send buffer used by TCP sockets.  This
         value overrides net.core.wmem_default used by other protocols.
@@ -553,13 +543,13 @@ udp_rmem_min - INTEGER
         Minimal size of receive buffer used by UDP sockets in moderation.
         Each UDP socket is able to use the size for receiving data, even if
         total pages of UDP sockets exceed udp_mem pressure. The unit is byte.
-        Default: 4096
+        Default: 1 page
 
 udp_wmem_min - INTEGER
         Minimal size of send buffer used by UDP sockets in moderation.
         Each UDP socket is able to use the size for sending data, even if
         total pages of UDP sockets exceed udp_mem pressure. The unit is byte.
-        Default: 4096
+        Default: 1 page
 
 CIPSOv4 Variables:
 
@@ -1002,7 +992,7 @@ bindv6only - BOOLEAN
                 TRUE: disable IPv4-mapped address feature
                 FALSE: enable IPv4-mapped address feature
 
-        Default: FALSE (as specified in RFC2553bis)
+        Default: FALSE (as specified in RFC3493)
 
 IPv6 Fragmentation:
 
@@ -1052,7 +1042,7 @@ conf/interface/*:
         The functional behaviour for certain settings is different
         depending on whether local forwarding is enabled or not.
 
-accept_ra - BOOLEAN
+accept_ra - INTEGER
         Accept Router Advertisements; autoconfigure using them.
 
         Possible values are:
@@ -1116,7 +1106,7 @@ dad_transmits - INTEGER
         The amount of Duplicate Address Detection probes to send.
         Default: 1
 
-forwarding - BOOLEAN
+forwarding - INTEGER
         Configure interface-specific Host/Router behaviour.
 
         Note: It is recommended to have the same setting on all
@@ -1465,10 +1455,17 @@ sctp_mem - vector of 3 INTEGERs: min, pressure, max
         Default is calculated at boot time from amount of available memory.
 
 sctp_rmem - vector of 3 INTEGERs: min, default, max
-        See tcp_rmem for a description.
+        Only the first value ("min") is used, "default" and "max" are
+        ignored.
+
+        min: Minimal size of receive buffer used by SCTP socket.
+        It is guaranteed to each SCTP socket (but not association) even
+        under moderate memory pressure.
+
+        Default: 1 page
 
 sctp_wmem  - vector of 3 INTEGERs: min, default, max
-        See tcp_wmem for a description.
+        Currently this tunable has no effect.
 
 addr_scope_policy - INTEGER
         Control IPv4 address scoping - draft-stewart-tsvwg-sctp-ipv4-00