tcp: do not pass timestamp to tcp_rack_mark_lost()

edumazet · davem330 · commit 128eda86bebe · 2017-04-26T14:44:37.000-04:00
This is no longer used, since tcp_rack_detect_loss() takes
the timestamp from tp-&gt;tcp_mstamp

Signed-off-by: Eric Dumazet &lt;edumazet@google.com&gt;
Acked-by: Soheil Hassas Yeganeh &lt;soheil@google.com&gt;
Acked-by: Neal Cardwell &lt;ncardwell@google.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/include/net/tcp.h b/include/net/tcp.h
@@ -1853,7 +1853,7 @@ void tcp_v4_init(void);
 void tcp_init(void);
 
 /* 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,
 			     const struct skb_mstamp *xmit_time,
 			     const struct skb_mstamp *ack_time);
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
@@ -2769,7 +2769,7 @@ static void tcp_rack_identify_loss(struct sock *sk, int *ack_flag,
 	if (sysctl_tcp_recovery & TCP_RACK_LOSS_DETECTION) {
 		u32 prior_retrans = tp->retrans_out;
 
-		tcp_rack_mark_lost(sk, ack_time);
+		tcp_rack_mark_lost(sk);
 		if (prior_retrans > tp->retrans_out)
 			*ack_flag |= FLAG_LOST_RETRANS;
 	}
diff --git a/net/ipv4/tcp_recovery.c b/net/ipv4/tcp_recovery.c
@@ -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);
 	u32 timeout;

Original file line number	Diff line number	Diff line change
`@@ -2769,7 +2769,7 @@ static void tcp_rack_identify_loss(struct sock sk, int ack_flag,`
`2769`	`2769`	`if (sysctl_tcp_recovery & TCP_RACK_LOSS_DETECTION) {`
`2770`	`2770`	`u32 prior_retrans = tp->retrans_out;`
`2771`	`2771`
`2772`		`- tcp_rack_mark_lost(sk, ack_time);`
	`2772`	`+ tcp_rack_mark_lost(sk);`
`2773`	`2773`	`if (prior_retrans > tp->retrans_out)`
`2774`	`2774`	`*ack_flag \|= FLAG_LOST_RETRANS;`
`2775`	`2775`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ static void tcp_rack_detect_loss(struct sock sk, u32 reo_timeout)`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`
`107`		`-void tcp_rack_mark_lost(struct sock sk, const struct skb_mstamp now)`
	`107`	`+void tcp_rack_mark_lost(struct sock *sk)`
`108`	`108`	`{`
`109`	`109`	`struct tcp_sock *tp = tcp_sk(sk);`
`110`	`110`	`u32 timeout;`