1 files changed, 2 insertions, 1 deletions

diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
index f753f9d2fee3..655dd8d7f064 100644
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@ -640,7 +640,8 @@ static void tcp_keepalive_timer (unsigned long data)
                 goto death;
         }
 
-        if (!sock_flag(sk, SOCK_KEEPOPEN) || sk->sk_state == TCP_CLOSE)
+        if (!sock_flag(sk, SOCK_KEEPOPEN) ||
+            ((1 << sk->sk_state) & (TCPF_CLOSE | TCPF_SYN_SENT)))
                 goto out;
 
         elapsed = keepalive_time_when(tp);