diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-13 16:51:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-13 16:51:32 -0400 |
| commit | 5d7d5d933256fc44f68e061ccd103b027fef0fc9 (patch) | |
| tree | c3effea9a99409d4adec80dcf358e6d99736ed25 /Documentation | |
| parent | 8d86e5f91440aa56a5df516bf58fe3883552ad56 (diff) | |
| parent | 7686d1cc5ed0932a533a5acbc3888b48de63bef8 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (21 commits)
slip: fix wrong SLIP6 ifdef-endif placing
natsemi: fix another dma-debug report
sctp: ABORT if receive, reassmbly, or reodering queue is not empty while closing socket
net: Fix default in docs for tcp_orphan_retries.
hso: fix a use after free condition
net/natsemi: Fix module parameter permissions
XFRM: Fix memory leak in xfrm_state_update
sctp: Enforce retransmission limit during shutdown
mac80211: fix TKIP replay vulnerability
mac80211: fix ie memory allocation for scheduled scans
ssb: fix init regression of hostmode PCI core
rtlwifi: rtl8192cu: Add new USB ID for Netgear WNA1000M
ath9k: Fix tx throughput drops for AR9003 chips with AES encryption
carl9170: add NEC WL300NU-AG usbid
cfg80211: fix deadlock with rfkill/sched_scan by adding new mutex
ath5k: fix incorrect use of drvdata in PCI suspend/resume code
ath5k: fix incorrect use of drvdata in sysfs code
Bluetooth: Fix memory leak under page timeouts
Bluetooth: Fix regression with incoming L2CAP connections
Bluetooth: Fix hidp disconnect deadlocks and lost wakeup
...
Diffstat (limited to 'Documentation')
| -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 d3d653a5f9b9..bfe924217f24 100644 --- a/Documentation/networking/ip-sysctl.txt +++ b/Documentation/networking/ip-sysctl.txt | |||
| @@ -346,7 +346,7 @@ tcp_orphan_retries - INTEGER | |||
| 346 | when RTO retransmissions remain unacknowledged. | 346 | when RTO retransmissions remain unacknowledged. |
| 347 | See tcp_retries2 for more details. | 347 | See tcp_retries2 for more details. |
| 348 | 348 | ||
| 349 | The default value is 7. | 349 | The default value is 8. |
| 350 | If your machine is a loaded WEB server, | 350 | If your machine is a loaded WEB server, |
| 351 | you should think about lowering this value, such sockets | 351 | you should think about lowering this value, such sockets |
| 352 | may consume significant resources. Cf. tcp_max_orphans. | 352 | may consume significant resources. Cf. tcp_max_orphans. |