X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=net%2Fipv4%2Ftcp_timer.c;h=3e358cbb1247c89fa9c81b3c560245bc21da16e6;hb=ebaac8c9a5b9e8aeab4009cefcfc1e9421337ac5;hp=e77e7ae0bf2c9c6be0651f1f0ac8fc95307bb567;hpb=e6e30add6bd8115af108de2a13ec82d997a55777;p=linux-2.6-omap-h63xx.git

diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
index e77e7ae0bf2..3e358cbb124 100644
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@ -487,11 +487,6 @@ static void tcp_keepalive_timer (unsigned long data)
 		goto death;
 	}
 
-	if (tp->defer_tcp_accept.request && sk->sk_state == TCP_ESTABLISHED) {
-		tcp_send_active_reset(sk, GFP_ATOMIC);
-		goto death;
-	}
-
 	if (!sock_flag(sk, SOCK_KEEPOPEN) || sk->sk_state == TCP_CLOSE)
 		goto out;