Date: Thu, 4 Mar 2021 10:36:39 GMT From: Michael Tuexen <tuexen@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: dc27d5312b78 - stable/12 - RACK: fix an issue triggered by using the CDG CC module Message-ID: <202103041036.124AadXs085727@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=dc27d5312b782b72740d71d81435a80dfe8b78bd commit dc27d5312b782b72740d71d81435a80dfe8b78bd Author: Michael Tuexen <tuexen@FreeBSD.org> AuthorDate: 2021-03-02 11:32:16 +0000 Commit: Michael Tuexen <tuexen@FreeBSD.org> CommitDate: 2021-03-04 10:35:03 +0000 RACK: fix an issue triggered by using the CDG CC module Manually resolved merge conflics. Obtained from: rrs@ PR: 238741 Sponsored by: Netlix, Inc. (cherry picked from commit 99adf230061268175a36061130e6adb0882270e8) --- sys/netinet/tcp_stacks/rack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 1d063a8a1f6f..fd1e3d18de08 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -7383,7 +7383,7 @@ again: sb_offset = tp->snd_nxt - tp->snd_una; else sb_offset = 0; - if (IN_RECOVERY(tp->t_flags) == 0) { + if (IN_FASTRECOVERY(tp->t_flags) == 0) { 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)) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103041036.124AadXs085727>