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

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

tcp: do not pass timestamp to tcp_rack_mark_lost() 



This is no longer used, since tcp_rack_detect_loss() takes
the timestamp from tp->tcp_mstamp

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 7c1c7308

include/net/tcp.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -1853,7 +1853,7 @@ void tcp_v4_init(void); 
void tcp_init(void);

void tcp_init(void);





/* tcp_recovery.c */

/* tcp_recovery.c */

extern void tcp_rack_mark_lost(struct sock *sk, const struct skb_mstamp *now);

extern void tcp_rack_mark_lost(struct sock *sk);

extern void tcp_rack_advance(struct tcp_sock *tp, u8 sacked, u32 end_seq,

extern void tcp_rack_advance(struct tcp_sock *tp, u8 sacked, u32 end_seq,

			     const struct skb_mstamp *xmit_time,

			     const struct skb_mstamp *xmit_time,

			     const struct skb_mstamp *ack_time);

			     const struct skb_mstamp *ack_time);

net/ipv4/tcp_input.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2769,7 +2769,7 @@ static void tcp_rack_identify_loss(struct sock *sk, int *ack_flag, 
	if (sysctl_tcp_recovery & TCP_RACK_LOSS_DETECTION) {

	if (sysctl_tcp_recovery & TCP_RACK_LOSS_DETECTION) {

		u32 prior_retrans = tp->retrans_out;

		u32 prior_retrans = tp->retrans_out;





		tcp_rack_mark_lost(sk, ack_time);

		tcp_rack_mark_lost(sk);

		if (prior_retrans > tp->retrans_out)

		if (prior_retrans > tp->retrans_out)

			*ack_flag |= FLAG_LOST_RETRANS;

			*ack_flag |= FLAG_LOST_RETRANS;

	}

	}

net/ipv4/tcp_recovery.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -104,7 +104,7 @@ static void tcp_rack_detect_loss(struct sock *sk, u32 *reo_timeout) 
	}

	}

}

}





void tcp_rack_mark_lost(struct sock *sk, const struct skb_mstamp *now)

void tcp_rack_mark_lost(struct sock *sk)

{

{

	struct tcp_sock *tp = tcp_sk(sk);

	struct tcp_sock *tp = tcp_sk(sk);

	u32 timeout;

	u32 timeout;