diff options
| author | Yuchung Cheng <ycheng@google.com> | 2017-12-07 11:33:32 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-08 14:14:11 -0500 |
| commit | 428aec5e69fa17d223e1495f395833c50770f7ae (patch) | |
| tree | c100aa3b176a3951c39a7a096e9e0b2ac5d25333 /net/ipv4 | |
| parent | cd1fc85b4399d47e3d6626301741ba8c38cd475a (diff) | |
| download | linux-stable-428aec5e69fa17d223e1495f395833c50770f7ae.tar.gz linux-stable-428aec5e69fa17d223e1495f395833c50770f7ae.tar.bz2 linux-stable-428aec5e69fa17d223e1495f395833c50770f7ae.zip | |
tcp: fix off-by-one bug in RACK
RACK should mark a packet lost when remaining wait time is zero.
Signed-off-by: Yuchung Cheng <ycheng@google.com>
Reviewed-by: Neal Cardwell <ncardwell@google.com>
Reviewed-by: Priyaranjan Jha <priyarjha@google.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/tcp_recovery.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/tcp_recovery.c b/net/ipv4/tcp_recovery.c index 3143664902e9..0c182303e62e 100644 --- a/net/ipv4/tcp_recovery.c +++ b/net/ipv4/tcp_recovery.c @@ -80,12 +80,12 @@ static void tcp_rack_detect_loss(struct sock *sk, u32 *reo_timeout) */ remaining = tp->rack.rtt_us + reo_wnd - tcp_stamp_us_delta(tp->tcp_mstamp, skb->skb_mstamp); - if (remaining < 0) { + if (remaining <= 0) { tcp_rack_mark_skb_lost(sk, skb); list_del_init(&skb->tcp_tsorted_anchor); } else { - /* Record maximum wait time (+1 to avoid 0) */ - *reo_timeout = max_t(u32, *reo_timeout, 1 + remaining); + /* Record maximum wait time */ + *reo_timeout = max_t(u32, *reo_timeout, remaining); } } } |