diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2012-04-10 00:56:42 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-27 10:17:01 -0700 |
| commit | ce30c9603e01ed68e7536a0936f30ec047acd57f (patch) | |
| tree | e02a59a7a5f3360142d6c5eefb9fc5bedf45f92a | |
| parent | 44ffc7c1c604e0ea5dd727b440b74b6121d152d9 (diff) | |
| download | linux-stable-ce30c9603e01ed68e7536a0936f30ec047acd57f.tar.gz linux-stable-ce30c9603e01ed68e7536a0936f30ec047acd57f.tar.bz2 linux-stable-ce30c9603e01ed68e7536a0936f30ec047acd57f.zip | |
tcp: restore correct limit
[ Upstream commit 5fb84b1428b271f8767e0eb3fcd7231896edfaa4 ]
Commit c43b874d5d714f (tcp: properly initialize tcp memory limits) tried
to fix a regression added in commits 4acb4190 & 3dc43e3,
but still get it wrong.
Result is machines with low amount of memory have too small tcp_rmem[2]
value and slow tcp receives : Per socket limit being 1/1024 of memory
instead of 1/128 in old kernels, so rcv window is capped to small
values.
Fix this to match comment and previous behavior.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Jason Wang <jasowang@redhat.com>
Cc: Glauber Costa <glommer@parallels.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/ipv4/tcp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 1229c26ca0cc..86014bbd3e34 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3299,8 +3299,7 @@ void __init tcp_init(void) tcp_init_mem(&init_net); /* Set per-socket limits to no more than 1/128 the pressure threshold */ - limit = nr_free_buffer_pages() << (PAGE_SHIFT - 10); - limit = max(limit, 128UL); + limit = nr_free_buffer_pages() << (PAGE_SHIFT - 7); max_share = min(4UL*1024*1024, limit); sysctl_tcp_wmem[0] = SK_MEM_QUANTUM; |