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

Commit 6728e7dc authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by David S. Miller
Browse files

[TCP]: Rename tcp_ack_packets_out -> tcp_rearm_rto 



Only thing that tiny function does is rearming the RTO (if
necessary), name it accordingly.

Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6ff03ac3

net/ipv4/tcp_input.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -2424,8 +2424,7 @@ static void tcp_cong_avoid(struct sock *sk, u32 ack, 
/* Restart timer after forward progress on connection.

/* Restart timer after forward progress on connection.

 * RFC2988 recommends to restart timer to now+rto.

 * RFC2988 recommends to restart timer to now+rto.

 */

 */



static void tcp_rearm_rto(struct sock *sk)

static void tcp_ack_packets_out(struct sock *sk)

{

{

	struct tcp_sock *tp = tcp_sk(sk);

	struct tcp_sock *tp = tcp_sk(sk);
@@ -2581,7 +2580,7 @@ static int tcp_clean_rtx_queue(struct sock *sk, __s32 *seq_rtt_p) 
			= inet_csk(sk)->icsk_ca_ops;

			= inet_csk(sk)->icsk_ca_ops;





		tcp_ack_update_rtt(sk, acked, seq_rtt);

		tcp_ack_update_rtt(sk, acked, seq_rtt);

		tcp_ack_packets_out(sk);

		tcp_rearm_rto(sk);





		if (tcp_is_reno(tp))

		if (tcp_is_reno(tp))

			tcp_remove_reno_sacks(sk, pkts_acked);

			tcp_remove_reno_sacks(sk, pkts_acked);