Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d05081e authored by Wei Wang's avatar Wei Wang Committed by David S. Miller
Browse files

tcp: clean up TFO server's initial tcp_rearm_rto() call 



This commit does a cleanup and moves tcp_rearm_rto() call in the TFO
server case into a previous spot in tcp_rcv_state_process() to make
it more compact.
This is only a cosmetic change.

Suggested-by: default avatarYuchung Cheng <ycheng@google.com>
Signed-off-by: default avatarWei Wang <weiwan@google.com>
Acked-by: default avatarNeal Cardwell <ncardwell@google.com>
Acked-by: default avatarYuchung Cheng <ycheng@google.com>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 27204aaa

net/ipv4/tcp_input.c

+9 −12
Original line number Diff line number Diff line
@@ -5911,6 +5911,15 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb) 
		if (req) {

			inet_csk(sk)->icsk_retransmits = 0;

			reqsk_fastopen_remove(sk, req, false);

			/* Re-arm the timer because data may have been sent out.

			 * This is similar to the regular data transmission case

			 * when new data has just been ack'ed.

			 *

			 * (TFO) - we could try to be more aggressive and

			 * retransmitting any data sooner based on when they

			 * are sent out.

			 */

			tcp_rearm_rto(sk);

		} else {

			tcp_init_transfer(sk, BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB);

			tp->copied_seq = tp->rcv_nxt;
@@ -5933,18 +5942,6 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb) 
		if (tp->rx_opt.tstamp_ok)

			tp->advmss -= TCPOLEN_TSTAMP_ALIGNED;



		if (req) {

			/* Re-arm the timer because data may have been sent out.

			 * This is similar to the regular data transmission case

			 * when new data has just been ack'ed.

			 *

			 * (TFO) - we could try to be more aggressive and

			 * retransmitting any data sooner based on when they

			 * are sent out.

			 */

			tcp_rearm_rto(sk);

		}



		if (!inet_csk(sk)->icsk_ca_ops->cong_control)

			tcp_update_pacing_rate(sk);