diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-19 23:25:34 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-19 23:25:34 +0200 |
| commit | 41ace1861a93f12f70ff10026fb1539fea38fcf8 (patch) | |
| tree | c6d841ae9b73d6b7d6a887c21ce378cebc9c97f7 /Documentation/networking | |
| parent | [PATCH] smc91x: disable DMA mode on the logicpd pxa270 (diff) | |
| parent | Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| download | linux-41ace1861a93f12f70ff10026fb1539fea38fcf8.tar.xz linux-41ace1861a93f12f70ff10026fb1539fea38fcf8.zip | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'Documentation/networking')
| -rw-r--r-- | Documentation/networking/ip-sysctl.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt index d46338af6002..3e0c017e7877 100644 --- a/Documentation/networking/ip-sysctl.txt +++ b/Documentation/networking/ip-sysctl.txt @@ -294,15 +294,15 @@ tcp_rmem - vector of 3 INTEGERs: min, default, max Default: 87380*2 bytes. tcp_mem - vector of 3 INTEGERs: min, pressure, max - low: below this number of pages TCP is not bothered about its + min: below this number of pages TCP is not bothered about its memory appetite. pressure: when amount of memory allocated by TCP exceeds this number of pages, TCP moderates its memory consumption and enters memory pressure mode, which is exited when memory consumption falls - under "low". + under "min". - high: number of pages allowed for queueing by all TCP sockets. + max: number of pages allowed for queueing by all TCP sockets. Defaults are calculated at boot time from amount of available memory. |