diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-14 10:56:40 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-14 10:56:40 -0400 |
| commit | 6a7ebdf2fd15417e87b4fd02ff411aeaca34da5f (patch) | |
| tree | 86b15d8cd3e25c97b348b5a61bdb16c02726a480 /Documentation/networking | |
| parent | f6b72b6217f8c24f2a54988e58af858b4e66024d (diff) | |
| parent | 51414d41084496aaefd06d7f19eb8206e8bfac2d (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/bluetooth/l2cap_core.c
Diffstat (limited to 'Documentation/networking')
| -rw-r--r-- | Documentation/networking/ip-sysctl.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt index e3df1191e717..db2a4067013c 100644 --- a/Documentation/networking/ip-sysctl.txt +++ b/Documentation/networking/ip-sysctl.txt | |||
| @@ -336,7 +336,7 @@ tcp_orphan_retries - INTEGER | |||
| 336 | when RTO retransmissions remain unacknowledged. | 336 | when RTO retransmissions remain unacknowledged. |
| 337 | See tcp_retries2 for more details. | 337 | See tcp_retries2 for more details. |
| 338 | 338 | ||
| 339 | The default value is 7. | 339 | The default value is 8. |
| 340 | If your machine is a loaded WEB server, | 340 | If your machine is a loaded WEB server, |
| 341 | you should think about lowering this value, such sockets | 341 | you should think about lowering this value, such sockets |
| 342 | may consume significant resources. Cf. tcp_max_orphans. | 342 | may consume significant resources. Cf. tcp_max_orphans. |