---

yaml --- r: 203149 b: refs/heads/master c: 565b7b2 h: refs/heads/master i: 203147: 4a76616 v: v3
git-mirror · Jun 25, 2010 · a5fb0be · a5fb0be
1 parent 6f8eed5
commit a5fb0be
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a938f80264f2cbfb0c0841b450eab42a8093281
+refs/heads/master: 565b7b2d2e632b5792879c0c9cccdd9eecd31195
diff --git a/trunk/net/ipv4/tcp.c b/trunk/net/ipv4/tcp.c
@@ -1898,6 +1898,10 @@ void tcp_close(struct sock *sk, long timeout)
 
 	sk_mem_reclaim(sk);
 
+	/* If socket has been already reset (e.g. in tcp_reset()) - kill it. */
+	if (sk->sk_state == TCP_CLOSE)
+		goto adjudge_to_death;
+
 	/* As outlined in RFC 2525, section 2.17, we send a RST here because
 	 * data was lost. To witness the awful effects of the old behavior of
 	 * always doing a FIN, run an older 2.1.x kernel or 2.0.x, start a bulk