Date: Tue, 26 Jan 2021 17:09:08 +0100 From: Michael Tuexen <Michael.Tuexen@macmic.franken.de> To: Richard Scheffenegger <rscheff@FreeBSD.org> Cc: "src-committers@freebsd.org" <src-committers@FreeBSD.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@FreeBSD.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@FreeBSD.org> Subject: Re: git: 84761f3df508 - main - Adjust line length in tcp_prr_partialack Message-ID: <84A0BAE9-0553-4D19-9F48-535A4B9473D3@macmic.franken.de> In-Reply-To: <202101261501.10QF16hV000586@gitrepo.freebsd.org> References: <202101261501.10QF16hV000586@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
> On 26. Jan 2021, at 16:01, Richard Scheffenegger <rscheff@FreeBSD.org> = wrote: >=20 > The branch main has been updated by rscheff: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D84761f3df508aed50783b60f028af9d9= 8a684b41 >=20 > commit 84761f3df508aed50783b60f028af9d98a684b41 > Author: Richard Scheffenegger <rscheff@FreeBSD.org> > AuthorDate: 2021-01-26 13:47:19 +0000 > Commit: Richard Scheffenegger <rscheff@FreeBSD.org> > CommitDate: 2021-01-26 13:47:19 +0000 >=20 > Adjust line length in tcp_prr_partialack >=20 > Summary: > Wrap lines before column 80 in new prr code checked in recently. >=20 > No functional changes. >=20 > Reviewers: tuexen, rrs, jtl, mm, kbowling, #transport >=20 > Reviewed By: tuexen, mm, #transport >=20 > Subscribers: imp, melifaro >=20 > Differential Revision: https://reviews.freebsd.org/D28329 Any plans to MFC this to stable/13? Best regards Michael > --- > sys/netinet/tcp_input.c | 13 ++++++++----- > 1 file changed, 8 insertions(+), 5 deletions(-) >=20 > diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c > index 75718352da00..4b8f91ed9d0b 100644 > --- a/sys/netinet/tcp_input.c > +++ b/sys/netinet/tcp_input.c > @@ -3949,14 +3949,17 @@ tcp_prr_partialack(struct tcpcb *tp, struct = tcphdr *th) > * Proportional Rate Reduction > */ > if (pipe > tp->snd_ssthresh) > - snd_cnt =3D (tp->sackhint.prr_delivered * = tp->snd_ssthresh / tp->sackhint.recover_fs) - > - tp->sackhint.sack_bytes_rexmit; > + snd_cnt =3D (tp->sackhint.prr_delivered * = tp->snd_ssthresh / > + tp->sackhint.recover_fs) - = tp->sackhint.sack_bytes_rexmit; > else { > if (V_tcp_do_prr_conservative) > - limit =3D tp->sackhint.prr_delivered - = tp->sackhint.sack_bytes_rexmit; > + limit =3D tp->sackhint.prr_delivered - > + tp->sackhint.sack_bytes_rexmit; > else > - if ((tp->sackhint.prr_delivered - = tp->sackhint.sack_bytes_rexmit) > del_data) > - limit =3D tp->sackhint.prr_delivered - = tp->sackhint.sack_bytes_rexmit + maxseg; > + if ((tp->sackhint.prr_delivered - > + tp->sackhint.sack_bytes_rexmit) > del_data) > + limit =3D tp->sackhint.prr_delivered - > + tp->sackhint.sack_bytes_rexmit + = maxseg; > else > limit =3D del_data + maxseg; > snd_cnt =3D min((tp->snd_ssthresh - pipe), limit);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?84A0BAE9-0553-4D19-9F48-535A4B9473D3>