aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/networking/ip-sysctl.txt
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2006-08-22 14:42:36 -0400
committerJohn W. Linville <linville@tuxdriver.com>2006-08-22 14:42:36 -0400
commit69758820a42da207bdc775d6eccf1f9fb67cd62e (patch)
tree4c4dd2b596aa5535231656bf0fa1bc65a8b17471 /Documentation/networking/ip-sysctl.txt
parent113b898e38cb20e80847c24154ce62273b948c6a (diff)
parentef7d1b244fa6c94fb76d5f787b8629df64ea4046 (diff)
downloadkernel_samsung_aries-69758820a42da207bdc775d6eccf1f9fb67cd62e.zip
kernel_samsung_aries-69758820a42da207bdc775d6eccf1f9fb67cd62e.tar.gz
kernel_samsung_aries-69758820a42da207bdc775d6eccf1f9fb67cd62e.tar.bz2
Merge branch 'from-linus' into upstream
Diffstat (limited to 'Documentation/networking/ip-sysctl.txt')
-rw-r--r--Documentation/networking/ip-sysctl.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index d46338a..3e0c017 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.