git: 31d7a27c6e88 - main - PRR: Avoid accounting left-edge twice in partial ACK.

[Richard Scheffenegger]

The branch main has been updated by rscheff:

URL: https://cgit.FreeBSD.org/src/commit/?id=31d7a27c6e88c3d5bd0907774ec70176a92da5bb

commit 31d7a27c6e88c3d5bd0907774ec70176a92da5bb
Author:     Richard Scheffenegger <rscheff at FreeBSD.org>
AuthorDate: 2021-02-25 17:36:49 +0000
Commit:     Richard Scheffenegger <rscheff at FreeBSD.org>
CommitDate: 2021-02-25 17:37:47 +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
---
 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 ca4a4c833dc2..bbc93a93810c 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -3950,9 +3950,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