aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorBrian Haley <brian.haley@hp.com>2009-03-18 21:22:48 -0400
committerDavid S. Miller <davem@davemloft.net>2009-03-18 21:22:48 -0400
commit9bdd8d40c8c59435664af6049dabe24b7779b203 (patch)
tree9487117b9c98bcab3b0884fffa10dfbb0b01292a /Documentation
parentcedc1dba74f481a632c5d5aedad0068d6ad945d8 (diff)
ipv6: Fix incorrect disable_ipv6 behavior
Fix the behavior of allowing both sysctl and addrconf_dad_failure() to set the disable_ipv6 parameter without any bad side-effects. If DAD fails and accept_dad > 1, we will still set disable_ipv6=1, but then instead of allowing an RA to add an address then immediately fail DAD, we simply don't allow the address to be added in the first place. This also lets the user set this flag and disable all IPv6 addresses on the interface, or on the entire system. Signed-off-by: Brian Haley <brian.haley@hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/networking/ip-sysctl.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index 7185e4c41e59..ec5de02f543f 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -1043,7 +1043,9 @@ max_addresses - INTEGER
1043 Default: 16 1043 Default: 16
1044 1044
1045disable_ipv6 - BOOLEAN 1045disable_ipv6 - BOOLEAN
1046 Disable IPv6 operation. 1046 Disable IPv6 operation. If accept_dad is set to 2, this value
1047 will be dynamically set to TRUE if DAD fails for the link-local
1048 address.
1047 Default: FALSE (enable IPv6 operation) 1049 Default: FALSE (enable IPv6 operation)
1048 1050
1049accept_dad - INTEGER 1051accept_dad - INTEGER