Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[cascardo/linux.git] / Documentation / networking / ip-sysctl.txt

diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index caedb18..0307e28 100644 (file)
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -65,6 +65,12 @@ neigh/default/gc_thresh1 - INTEGER
        purge entries if there are fewer than this number.
        Default: 128
 
+neigh/default/gc_thresh2 - INTEGER
+       Threshold when garbage collector becomes more aggressive about
+       purging entries. Entries older than 5 seconds will be cleared
+       when over this number.
+       Default: 512
+
 neigh/default/gc_thresh3 - INTEGER
        Maximum number of neighbor entries allowed.  Increase this
        when using large numbers of interfaces and when communicating
@@ -757,8 +763,21 @@ icmp_ratelimit - INTEGER
        icmp_ratemask (see below) to specific targets.
        0 to disable any limiting,
        otherwise the minimal space between responses in milliseconds.
+       Note that another sysctl, icmp_msgs_per_sec limits the number
+       of ICMP packets sent on all targets.
+       Default: 1000
+
+icmp_msgs_per_sec - INTEGER
+       Limit maximal number of ICMP packets sent per second from this host.
+       Only messages whose type matches icmp_ratemask (see below) are
+       controlled by this limit.
        Default: 1000
 
+icmp_msgs_burst - INTEGER
+       icmp_msgs_per_sec controls number of ICMP packets sent per second,
+       while icmp_msgs_burst controls the burst size of these packets.
+       Default: 50
+
 icmp_ratemask - INTEGER
        Mask made of ICMP types for which rates are being limited.
        Significant bits: IHGFEDCBA9876543210
@@ -832,6 +851,11 @@ igmp_max_memberships - INTEGER
 
        conf/all/*        is special, changes the settings for all interfaces
 
+igmp_qrv - INTEGER
+        Controls the IGMP query robustness variable (see RFC2236 8.1).
+        Default: 2 (as specified by RFC2236 8.1)
+        Minimum: 1 (as specified by RFC6636 4.5)
+
 log_martians - BOOLEAN
        Log packets with impossible addresses to kernel log.
        log_martians for the interface will be enabled if at least one of
@@ -935,14 +959,9 @@ accept_source_route - BOOLEAN
                FALSE (host)
 
 accept_local - BOOLEAN
-       Accept packets with local source addresses. In combination
-       with suitable routing, this can be used to direct packets
-       between two local interfaces over the wire and have them
-       accepted properly.
-
-       rp_filter must be set to a non-zero value in order for
-       accept_local to have an effect.
-
+       Accept packets with local source addresses. In combination with
+       suitable routing, this can be used to direct packets between two
+       local interfaces over the wire and have them accepted properly.
        default FALSE
 
 route_localnet - BOOLEAN
@@ -1140,6 +1159,11 @@ anycast_src_echo_reply - BOOLEAN
        FALSE: disabled
        Default: FALSE
 
+mld_qrv - INTEGER
+       Controls the MLD query robustness variable (see RFC3810 9.1).
+       Default: 2 (as specified by RFC3810 9.1)
+       Minimum: 1 (as specified by RFC6636 4.5)
+
 IPv6 Fragmentation:
 
 ip6frag_high_thresh - INTEGER