From 929fb5d1a928b259f96d3e690c4f07d7d1011f85 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Fri, 30 Nov 2012 10:08:52 +0000 Subject: [PATCH] --- yaml --- r: 341693 b: refs/heads/master c: fd90b29d757827ab12d6669292612308ec249532 h: refs/heads/master i: 341691: b24e949c86cad7427fe3120f4b3bbaabfb10daed v: v3 --- [refs] | 2 +- trunk/net/ipv4/tcp.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f038a3416e17..24f2d5a76a55 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: abe303dbc22bd16cde6f1a62fc25f63cc254caf7 +refs/heads/master: fd90b29d757827ab12d6669292612308ec249532 diff --git a/trunk/net/ipv4/tcp.c b/trunk/net/ipv4/tcp.c index e6eace1c2bdb..1aca02c9911e 100644 --- a/trunk/net/ipv4/tcp.c +++ b/trunk/net/ipv4/tcp.c @@ -3590,8 +3590,7 @@ void __init tcp_init(void) alloc_large_system_hash("TCP established", sizeof(struct inet_ehash_bucket), thash_entries, - (totalram_pages >= 128 * 1024) ? - 13 : 15, + 17, /* one slot per 128 KB of memory */ 0, NULL, &tcp_hashinfo.ehash_mask, @@ -3607,8 +3606,7 @@ void __init tcp_init(void) alloc_large_system_hash("TCP bind", sizeof(struct inet_bind_hashbucket), tcp_hashinfo.ehash_mask + 1, - (totalram_pages >= 128 * 1024) ? - 13 : 15, + 17, /* one slot per 128 KB of memory */ 0, &tcp_hashinfo.bhash_size, NULL,