diff options
| author | Mark Brown <broonie@kernel.org> | 2019-01-29 12:04:54 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-01-29 12:04:54 +0000 |
| commit | d7c26e63cf78fef01d66ae848184c6ee5f4b8bbf (patch) | |
| tree | 3765745a38a7ae1a4a3a056dfc6c736e4c99271d /net/ipv4/tcp_timer.c | |
| parent | a8233b6c1972e1959cf84a021aeb61ddcd23cc26 (diff) | |
| parent | f17b5f06cb92ef2250513a1e154c47b78df07d40 (diff) | |
Merge tag 'v5.0-rc4' into asoc-5.1
Linux 5.0-rc4
Diffstat (limited to 'net/ipv4/tcp_timer.c')
| -rw-r--r-- | net/ipv4/tcp_timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index f87dbc78b6bc..71a29e9c0620 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c @@ -226,7 +226,7 @@ static int tcp_write_timeout(struct sock *sk) if ((1 << sk->sk_state) & (TCPF_SYN_SENT | TCPF_SYN_RECV)) { if (icsk->icsk_retransmits) { dst_negative_advice(sk); - } else if (!tp->syn_data && !tp->syn_fastopen) { + } else { sk_rethink_txhash(sk); } retry_until = icsk->icsk_syn_retries ? : net->ipv4.sysctl_tcp_syn_retries; |