git: 43a2f41379f5 - releng/13.0 - RACK: fix an issue triggered by using the CDG CC module

[Michael Tuexen]

The branch releng/13.0 has been updated by tuexen:

URL: https://cgit.FreeBSD.org/src/commit/?id=43a2f41379f5b2a5aea94cc8389b181bf2d35b65

commit 43a2f41379f5b2a5aea94cc8389b181bf2d35b65
Author:     Michael Tuexen <tuexen at FreeBSD.org>
AuthorDate: 2021-03-02 11:32:16 +0000
Commit:     Michael Tuexen <tuexen at FreeBSD.org>
CommitDate: 2021-03-04 11:00:34 +0000

    RACK: fix an issue triggered by using the CDG CC module
    
    Obtained from:          rrs@
    Approved by:            re (gjb)
    PR:                     238741
    Sponsored by:           Netlix, Inc.
    
    (cherry picked from commit 99adf230061268175a36061130e6adb0882270e8)
    (cherry picked from commit ae608d4ee7202cc34603e620bc551547e772c4d2)
---
 sys/netinet/tcp_stacks/rack.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c
index 8e00cae85496..4d1a4cc8a0eb 100644
--- a/sys/netinet/tcp_stacks/rack.c
+++ b/sys/netinet/tcp_stacks/rack.c
@@ -12305,7 +12305,7 @@ again:
 			sb_offset = tp->snd_nxt - tp->snd_una;
 		else
 			sb_offset = 0;
-		if ((IN_RECOVERY(tp->t_flags) == 0) || rack->rack_no_prr) {
+		if ((IN_FASTRECOVERY(tp->t_flags) == 0) || rack->rack_no_prr) {
 			if (rack->r_ctl.rc_tlp_new_data) {
 				/* TLP is forcing out new data */
 				if (rack->r_ctl.rc_tlp_new_data > (uint32_t) (avail - sb_offset)) {
@@ -12319,7 +12319,7 @@ again:
 				new_data_tlp = doing_tlp = 1;
 			}  else
 				len = rack_what_can_we_send(tp, rack, cwnd_to_use, avail, sb_offset);
-			if (IN_RECOVERY(tp->t_flags) && (len > segsiz)) {
+			if (IN_FASTRECOVERY(tp->t_flags) && (len > segsiz)) {
 				/*
 				 * For prr=off, we need to send only 1 MSS
 				 * at a time. We do this because another sack could