diff --git a/[refs] b/[refs] index 82719abf222c..4c015d23c487 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ecd159fc5f415fa742d5daa5b43200606e6ad493 +refs/heads/master: 5fb84b1428b271f8767e0eb3fcd7231896edfaa4 diff --git a/trunk/net/ipv4/tcp.c b/trunk/net/ipv4/tcp.c index 5d54ed30e821..7758a83f98ff 100644 --- a/trunk/net/ipv4/tcp.c +++ b/trunk/net/ipv4/tcp.c @@ -3302,8 +3302,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;