From 9384aa7e90cf0e79399e360b7c98f54a05394a35 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Mon, 14 Nov 2011 10:56:56 +0000
Subject: [PATCH] --- yaml --- r: 275713 b: refs/heads/master c:
 709e8697af1c86772c1a6fccda6d4b0e2e226547 h: refs/heads/master i:   275711:
 f6f7b8a91e82be607507eac8ad791d03c7c714c5 v: v3

---
 [refs]                    | 2 +-
 trunk/net/ipv4/tcp_ipv4.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 74d6fcfa1463..b24717502328 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46993f02d88ae9fc6dfb4e8625d80a1630e7863b
+refs/heads/master: 709e8697af1c86772c1a6fccda6d4b0e2e226547
diff --git a/trunk/net/ipv4/tcp_ipv4.c b/trunk/net/ipv4/tcp_ipv4.c
index a7443159c400..a9db4b1a2215 100644
--- a/trunk/net/ipv4/tcp_ipv4.c
+++ b/trunk/net/ipv4/tcp_ipv4.c
@@ -1510,6 +1510,7 @@ struct sock *tcp_v4_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
 	NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENDROPS);
 	return NULL;
 put_and_exit:
+	tcp_clear_xmit_timers(newsk);
 	bh_unlock_sock(newsk);
 	sock_put(newsk);
 	goto exit;