summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2010-02-24 11:55:16 +0100
committerThomas Gleixner <tglx@linutronix.de>2010-02-24 11:55:16 +0100
commit8e7deaa4367607057fd7c1038d2f6df981367bd5 (patch)
tree971e4ca767c3bad790ba13c0dade61181a7d0bb2 /Documentation
parent534714781c652a7113b6c90479a781a6b510279e (diff)
parent75ef7cdda2daa35be9e070ac8e5258759ac03d06 (diff)
downloadlwn-8e7deaa4367607057fd7c1038d2f6df981367bd5.tar.gz
lwn-8e7deaa4367607057fd7c1038d2f6df981367bd5.zip
Merge branch 'linus' into rt/head
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/networking/ip-sysctl.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index 006b39dec87d..e87f3cdc8a6a 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -1074,10 +1074,10 @@ regen_max_retry - INTEGER
Default: 5
max_addresses - INTEGER
- Number of maximum addresses per interface. 0 disables limitation.
- It is recommended not set too large value (or 0) because it would
- be too easy way to crash kernel to allow to create too much of
- autoconfigured addresses.
+ Maximum number of autoconfigured addresses per interface. Setting
+ to zero disables the limitation. It is not recommended to set this
+ value too large (or to zero) because it would be an easy way to
+ crash the kernel by allowing too many addresses to be created.
Default: 16
disable_ipv6 - BOOLEAN