diff options
| author | Jason Wang <jasowang@redhat.com> | 2012-02-02 01:07:00 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-02 20:34:41 +0100 |
| commit | c43b874d5d714f271b80d4c3f49e05d0cbf51ed2 (patch) | |
| tree | c56f3500327b081228d4c7369d39740e9bb4a0a9 /net/ipv4/tcp.c | |
| parent | ethtool: Null-terminate filename passed to ethtool_ops::flash_device (diff) | |
| download | linux-c43b874d5d714f271b80d4c3f49e05d0cbf51ed2.tar.xz linux-c43b874d5d714f271b80d4c3f49e05d0cbf51ed2.zip | |
tcp: properly initialize tcp memory limits
Commit 4acb4190 tries to fix the using uninitialized value
introduced by commit 3dc43e3, but it would make the
per-socket memory limits too small.
This patch fixes this and also remove the redundant codes
introduced in 4acb4190.
Signed-off-by: Jason Wang <jasowang@redhat.com>
Acked-by: Glauber Costa <glommer@parallels.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp.c')
| -rw-r--r-- | net/ipv4/tcp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index a34f5cfdd44c..37755ccc0e96 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3229,7 +3229,6 @@ __setup("thash_entries=", set_thash_entries); void tcp_init_mem(struct net *net) { - /* Set per-socket limits to no more than 1/128 the pressure threshold */ unsigned long limit = nr_free_buffer_pages() / 8; limit = max(limit, 128UL); net->ipv4.sysctl_tcp_mem[0] = limit / 4 * 3; @@ -3298,7 +3297,8 @@ void __init tcp_init(void) sysctl_max_syn_backlog = max(128, cnt / 256); tcp_init_mem(&init_net); - limit = nr_free_buffer_pages() / 8; + /* 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); max_share = min(4UL*1024*1024, limit); |