Merge branch 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mv-sheeva.git] / Documentation / networking / ip-sysctl.txt

diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index 946b66e1b65214f4becc5d2563f73180fe331837..c7712787933c1734c98a0191db23d9cb2886d0f8 100644 (file)
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -27,6 +27,12 @@ min_adv_mss - INTEGER
        The advertised MSS depends on the first hop route MTU, but will
        never be lower than this setting.
 
+rt_cache_rebuild_count - INTEGER
+       The per net-namespace route cache emergency rebuild threshold.
+       Any net-namespace having its route cache rebuilt due to
+       a hash bucket chain being too long more than this many times
+       will have its route caching disabled
+
 IP Fragmentation:
 
 ipfrag_high_thresh - INTEGER
@@ -551,8 +557,9 @@ icmp_echo_ignore_broadcasts - BOOLEAN
 icmp_ratelimit - INTEGER
        Limit the maximal rates for sending ICMP packets whose type matches
        icmp_ratemask (see below) to specific targets.
-       0 to disable any limiting, otherwise the maximal rate in jiffies(1)
-       Default: 100
+       0 to disable any limiting,
+       otherwise the minimal space between responses in milliseconds.
+       Default: 1000
 
 icmp_ratemask - INTEGER
        Mask made of ICMP types for which rates are being limited.
@@ -1023,11 +1030,23 @@ max_addresses - INTEGER
        autoconfigured addresses.
        Default: 16
 
+disable_ipv6 - BOOLEAN
+       Disable IPv6 operation.
+       Default: FALSE (enable IPv6 operation)
+
+accept_dad - INTEGER
+       Whether to accept DAD (Duplicate Address Detection).
+       0: Disable DAD
+       1: Enable DAD (default)
+       2: Enable DAD, and disable IPv6 operation if MAC-based duplicate
+          link-local address has been found.
+
 icmp/*:
 ratelimit - INTEGER
        Limit the maximal rates for sending ICMPv6 packets.
-       0 to disable any limiting, otherwise the maximal rate in jiffies(1)
-       Default: 100
+       0 to disable any limiting,
+       otherwise the minimal space between responses in milliseconds.
+       Default: 1000
 
 
 IPv6 Update by: