tcp: use tcp_skb_sent_after() instead in RACK

This patch doesn't change any functionality.

Signed-off-by: Pengcheng Yang <yangpc@wangsu.com>
Cc: Neal Cardwell <ncardwell@google.com>
Acked-by: Neal Cardwell <ncardwell@google.com>
Tested-by: Neal Cardwell <ncardwell@google.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ipv4/tcp_recovery.c b/net/ipv4/tcp_recovery.c
index fd113f6226efcabec4a166db3d96078733b4c6a9..48f30e7209f291c9191074e5f4a11501a374961c 100644 (file)
--- a/net/ipv4/tcp_recovery.c
+++ b/net/ipv4/tcp_recovery.c
@@ -2,11 +2,6 @@
 #include <linux/tcp.h>
 #include <net/tcp.h>
 
-static bool tcp_rack_sent_after(u64 t1, u64 t2, u32 seq1, u32 seq2)
-{
-       return t1 > t2 || (t1 == t2 && after(seq1, seq2));
-}
-
 static u32 tcp_rack_reo_wnd(const struct sock *sk)
 {
        struct tcp_sock *tp = tcp_sk(sk);
@@ -77,9 +72,9 @@ static void tcp_rack_detect_loss(struct sock *sk, u32 *reo_timeout)
                    !(scb->sacked & TCPCB_SACKED_RETRANS))
                        continue;
 
-               if (!tcp_rack_sent_after(tp->rack.mstamp,
-                                        tcp_skb_timestamp_us(skb),
-                                        tp->rack.end_seq, scb->end_seq))
+               if (!tcp_skb_sent_after(tp->rack.mstamp,
+                                       tcp_skb_timestamp_us(skb),
+                                       tp->rack.end_seq, scb->end_seq))
                        break;
 
                /* A packet is lost if it has not been s/acked beyond
@@ -140,8 +135,8 @@ void tcp_rack_advance(struct tcp_sock *tp, u8 sacked, u32 end_seq,
        }
        tp->rack.advanced = 1;
        tp->rack.rtt_us = rtt_us;
-       if (tcp_rack_sent_after(xmit_time, tp->rack.mstamp,
-                               end_seq, tp->rack.end_seq)) {
+       if (tcp_skb_sent_after(xmit_time, tp->rack.mstamp,
+                              end_seq, tp->rack.end_seq)) {
                tp->rack.mstamp = xmit_time;
                tp->rack.end_seq = end_seq;
        }