diff options
author | Steven Rostedt <srostedt@redhat.com> | 2012-05-22 11:19:51 -0400 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2012-05-22 11:19:51 -0400 |
commit | 465ba9575e0db6b2655d3a01c05f4c0de2548fc2 (patch) | |
tree | bd51ebe34f1e22c5b1926c6245ed399dd808b2fb /Documentation | |
parent | f4162227ef21455c1b1bd74565e49e4c596cecb0 (diff) | |
parent | 091ce3d38e5e57cf7dd44d66335725910e928f59 (diff) |
Merge tag 'v3.0.32' into v3.0-rt
This is the 3.0.32 stable release
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/networking/ip-sysctl.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt index bfe924217f24..7d4ecaa57cfa 100644 --- a/Documentation/networking/ip-sysctl.txt +++ b/Documentation/networking/ip-sysctl.txt @@ -147,7 +147,7 @@ tcp_adv_win_scale - INTEGER (if tcp_adv_win_scale > 0) or bytes-bytes/2^(-tcp_adv_win_scale), if it is <= 0. Possible values are [-31, 31], inclusive. - Default: 2 + Default: 1 tcp_allowed_congestion_control - STRING Show/set the congestion control choices available to non-privileged @@ -407,7 +407,7 @@ tcp_rmem - vector of 3 INTEGERs: min, default, max net.core.rmem_max. Calling setsockopt() with SO_RCVBUF disables automatic tuning of that socket's receive buffer size, in which case this value is ignored. - Default: between 87380B and 4MB, depending on RAM size. + Default: between 87380B and 6MB, depending on RAM size. tcp_sack - BOOLEAN Enable select acknowledgments (SACKS). |