diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-26 02:22:42 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-26 02:22:42 -0500 |
| commit | 04488734806948624dabc4514f96f14cd75b9a50 (patch) | |
| tree | 74f3a3c10a7177a5f86398b83ad7bf0569fe8b89 /Documentation/networking | |
| parent | 54831a83bfe656c4c54e287c734c6b0ccaa3719b (diff) | |
| parent | c4d49794ff2838038fd9756eae39c39a5a685833 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'Documentation/networking')
| -rw-r--r-- | Documentation/networking/ip-sysctl.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt index 2571a62d923e..8b72c88ba213 100644 --- a/Documentation/networking/ip-sysctl.txt +++ b/Documentation/networking/ip-sysctl.txt | |||
| @@ -1126,10 +1126,10 @@ regen_max_retry - INTEGER | |||
| 1126 | Default: 5 | 1126 | Default: 5 |
| 1127 | 1127 | ||
| 1128 | max_addresses - INTEGER | 1128 | max_addresses - INTEGER |
| 1129 | Number of maximum addresses per interface. 0 disables limitation. | 1129 | Maximum number of autoconfigured addresses per interface. Setting |
| 1130 | It is recommended not set too large value (or 0) because it would | 1130 | to zero disables the limitation. It is not recommended to set this |
| 1131 | be too easy way to crash kernel to allow to create too much of | 1131 | value too large (or to zero) because it would be an easy way to |
| 1132 | autoconfigured addresses. | 1132 | crash the kernel by allowing too many addresses to be created. |
| 1133 | Default: 16 | 1133 | Default: 16 |
| 1134 | 1134 | ||
| 1135 | disable_ipv6 - BOOLEAN | 1135 | disable_ipv6 - BOOLEAN |