---

yaml --- r: 275713 b: refs/heads/master c: 709e869 h: refs/heads/master i: 275711: f6f7b8a v: v3
git-mirror · Nov 16, 2011 · 9384aa7 · 9384aa7
1 parent 5451938
commit 9384aa7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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;