From 824b91eb8f38602a581dd79db05ce4f16f8d162a Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Tue, 10 Apr 2012 00:56:42 +0000 Subject: [PATCH] --- yaml --- r: 299019 b: refs/heads/master c: 5fb84b1428b271f8767e0eb3fcd7231896edfaa4 h: refs/heads/master i: 299017: 77785d8b69e0eff9b48fcc3741744a5302baed4b 299015: 296e88d16d923eba8545fe4ea58559e3dd4b0ea2 v: v3 --- [refs] | 2 +- trunk/net/ipv4/tcp.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) 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;