Message ID | 20190510230019.137937-1-ycheng@google.com |
---|---|
State | Changes Requested |
Delegated to: | David Miller |
Headers | show |
Series | [net] tcp: fix retrans timestamp on passive Fast Open | expand |
From: Yuchung Cheng <ycheng@google.com> Date: Fri, 10 May 2019 16:00:19 -0700 > Fixes: 3844718c20d0 ("tcp: properly track retry time on passive Fast Open") This is not a valid commit ID.
From: David Miller <davem@davemloft.net> Date: Fri, May 10, 2019 at 4:41 PM To: <ycheng@google.com> Cc: <netdev@vger.kernel.org>, <ncardwell@google.com> > From: Yuchung Cheng <ycheng@google.com> > Date: Fri, 10 May 2019 16:00:19 -0700 > > > Fixes: 3844718c20d0 ("tcp: properly track retry time on passive Fast Open") > > This is not a valid commit ID. Oops submitting a v2. sorry for the typo
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 20f6fac5882e..cf69f50855ea 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -6024,6 +6024,9 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb, static void tcp_rcv_synrecv_state_fastopen(struct sock *sk) { tcp_try_undo_loss(sk, false); + + /* Reset rtx states to prevent spurious retransmits_timed_out() */ + tcp_sk(sk)->retrans_stamp = 0; inet_csk(sk)->icsk_retransmits = 0; /* Once we leave TCP_SYN_RECV or TCP_FIN_WAIT_1,