The branch stable/13 has been updated by rscheff:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=25fb4c363b299c26c35158fa059379af4a007253

commit 25fb4c363b299c26c35158fa059379af4a007253
Author:     Richard Scheffenegger <rsch...@freebsd.org>
AuthorDate: 2021-02-25 17:36:49 +0000
Commit:     Richard Scheffenegger <rsch...@freebsd.org>
CommitDate: 2021-02-28 08:09:33 +0000

    PRR: Avoid accounting left-edge twice in partial ACK.
    
    Reviewed By:    #transport, kbowling
    MFC after:      3 days
    Sponsored by:   NetApp, Inc.
    Differential Revision:  https://reviews.freebsd.org/D28819
    
    (cherry picked from commit 31d7a27c6e88c3d5bd0907774ec70176a92da5bb)
---
 sys/netinet/tcp_input.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 96c594a4c7cd..e096f2a13679 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -3932,9 +3932,7 @@ tcp_prr_partialack(struct tcpcb *tp, struct tcphdr *th)
         * (del_data) and an estimate of how many bytes are in the
         * network.
         */
-       if (SEQ_GEQ(th->th_ack, tp->snd_una))
-               del_data = BYTES_THIS_ACK(tp, th);
-       del_data += tp->sackhint.delivered_data;
+       del_data = tp->sackhint.delivered_data;
        if (V_tcp_do_rfc6675_pipe)
                pipe = tcp_compute_pipe(tp);
        else
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"

Reply via email to