p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Pengcheng Yang 2022-04-29 18:32:56 +08:00 committed by David S. Miller
parent ce7deda0d5
commit 5a8ad1ce2c
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
net/ipv4/tcp_recovery.c
View File

@ -2,11 +2,6 @@
#include <linux/tcp.h> #include <linux/tcp.h>
#include <net/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) static u32 tcp_rack_reo_wnd(const struct sock *sk)
{ {
struct tcp_sock *tp = tcp_sk(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)) !(scb->sacked & TCPCB_SACKED_RETRANS))
continue; continue;
if (!tcp_rack_sent_after(tp->rack.mstamp, if (!tcp_skb_sent_after(tp->rack.mstamp,
tcp_skb_timestamp_us(skb), tcp_skb_timestamp_us(skb),
tp->rack.end_seq, scb->end_seq)) tp->rack.end_seq, scb->end_seq))
break; break;
/* A packet is lost if it has not been s/acked beyond /* 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.advanced = 1;
tp->rack.rtt_us = rtt_us; tp->rack.rtt_us = rtt_us;
if (tcp_rack_sent_after(xmit_time, tp->rack.mstamp, if (tcp_skb_sent_after(xmit_time, tp->rack.mstamp,
end_seq, tp->rack.end_seq)) { end_seq, tp->rack.end_seq)) {
tp->rack.mstamp = xmit_time; tp->rack.mstamp = xmit_time;
tp->rack.end_seq = end_seq; tp->rack.end_seq = end_seq;
} }