[UDP]: No need to check afinfo != NULL in udp_proc_(un)register.

[linux-2.6-omap-h63xx.git] / net / ipv4 / tcp_timer.c

diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
index 803d758a2b124f0301f9dae7dbbd750722acf5e9..160d16f9f4fcd3c690ad600223d8e8ff3bf49fd5 100644 (file)
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@ -481,6 +481,11 @@ 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;