aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-07-03 03:07:58 -0700
committerDavid S. Miller <davem@davemloft.net>2008-07-03 03:07:58 -0700
commit44d28ab19c64d095314ac66f765d0c747519f4ed (patch)
tree20da263762645b5218936324b5cf9475ef1312b1 /Documentation
parent40b215e594b65a3488576c9d24b367548e18902a (diff)
parente0835f8fa56d2d308486f8a34cf1c4480cd27f4e (diff)
Merge branch 'net-next-2.6-v6ready-20080703' of git://git.linux-ipv6.org/gitroot/yoshfuji/linux-2.6-next
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/networking/ip-sysctl.txt11
1 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index 71c7bea9716..72f6d52e52e 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -1025,6 +1025,17 @@ 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.