diff --git a/[refs] b/[refs]
index 0596d480d80d..1073620089bd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e08a132b0ef3cf89dfbf1dea2c6248ea624bdcd7
+refs/heads/master: 0ccfe61803ad24f1c0fe5e1f5ce840ff0f3d9660
diff --git a/trunk/net/ipv4/tcp.c b/trunk/net/ipv4/tcp.c
index 2e6ad6dbba6c..c64072bb504b 100644
--- a/trunk/net/ipv4/tcp.c
+++ b/trunk/net/ipv4/tcp.c
@@ -2453,7 +2453,7 @@ void __init tcp_init(void)
 					0,
 					&tcp_hashinfo.ehash_size,
 					NULL,
-					0);
+					thash_entries ? 0 : 512 * 1024);
 	tcp_hashinfo.ehash_size = 1 << tcp_hashinfo.ehash_size;
 	for (i = 0; i < tcp_hashinfo.ehash_size; i++) {
 		rwlock_init(&tcp_hashinfo.ehash[i].lock);