diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-08-14 12:01:51 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-08-14 12:01:51 +0800 |
| commit | 5d296e2cec6ebbb062829078ffcd36a205c9b293 (patch) | |
| tree | bd83b344c43d728e61c72fa8975fdf41a4ec89ee /net/ipv4/tcp_timer.c | |
| parent | 13f1b95e47853fd2b7f25ff198bef38124b24959 (diff) | |
| parent | 6da35f43acde8f718b53f6f05fc865bffa709fc5 (diff) | |
Merge tag 'v4.9.43' into linux-linaro-lsk-v4.9linaro-lsk-v4.9.43
This is the 4.9.43 stable release
Diffstat (limited to 'net/ipv4/tcp_timer.c')
| -rw-r--r-- | net/ipv4/tcp_timer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index b1e65b3b4361..74db43b47917 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c @@ -654,7 +654,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); |