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

Commit efab8f85 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

tcp: do not pass timestamp to tcp_rack_identify_loss() 



Not used anymore now tp->tcp_mstamp holds the information.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Acked-by: default avatarSoheil Hassas Yeganeh <soheil@google.com>
Acked-by: default avatarNeal Cardwell <ncardwell@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 128eda86

net/ipv4/tcp_input.c

+4 −5
Original line number Diff line number Diff line
@@ -2760,8 +2760,7 @@ static bool tcp_try_undo_partial(struct sock *sk, const int acked) 
	return false;

}



static void tcp_rack_identify_loss(struct sock *sk, int *ack_flag,

				   const struct skb_mstamp *ack_time)

static void tcp_rack_identify_loss(struct sock *sk, int *ack_flag)

{

	struct tcp_sock *tp = tcp_sk(sk);
@@ -2857,11 +2856,11 @@ static void tcp_fastretrans_alert(struct sock *sk, const int acked, 
			tcp_try_keep_open(sk);

			return;

		}

		tcp_rack_identify_loss(sk, ack_flag, ack_time);

		tcp_rack_identify_loss(sk, ack_flag);

		break;

	case TCP_CA_Loss:

		tcp_process_loss(sk, flag, is_dupack, rexmit);

		tcp_rack_identify_loss(sk, ack_flag, ack_time);

		tcp_rack_identify_loss(sk, ack_flag);

		if (!(icsk->icsk_ca_state == TCP_CA_Open ||

		      (*ack_flag & FLAG_LOST_RETRANS)))

			return;
@@ -2877,7 +2876,7 @@ static void tcp_fastretrans_alert(struct sock *sk, const int acked, 
		if (icsk->icsk_ca_state <= TCP_CA_Disorder)

			tcp_try_undo_dsack(sk);



		tcp_rack_identify_loss(sk, ack_flag, ack_time);

		tcp_rack_identify_loss(sk, ack_flag);

		if (!tcp_time_to_recover(sk, flag)) {

			tcp_try_to_open(sk, flag);

			return;