From owner-dev-commits-src-main@freebsd.org Tue Jan 26 16:09:13 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BFB814F45C8; Tue, 26 Jan 2021 16:09:13 +0000 (UTC) (envelope-from Michael.Tuexen@macmic.franken.de) Received: from drew.franken.de (mail-n.franken.de [193.175.24.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.franken.de", Issuer "Sectigo RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DQBWF4NNgz4bsq; Tue, 26 Jan 2021 16:09:12 +0000 (UTC) (envelope-from Michael.Tuexen@macmic.franken.de) Received: from [IPv6:2a02:8109:1140:c3d:8cdb:3c2b:1f77:6217] (unknown [IPv6:2a02:8109:1140:c3d:8cdb:3c2b:1f77:6217]) (Authenticated sender: macmic) by mail-n.franken.de (Postfix) with ESMTPSA id 4F33A721BE016; Tue, 26 Jan 2021 17:09:09 +0100 (CET) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.40.0.2.32\)) Subject: Re: git: 84761f3df508 - main - Adjust line length in tcp_prr_partialack From: Michael Tuexen In-Reply-To: <202101261501.10QF16hV000586@gitrepo.freebsd.org> Date: Tue, 26 Jan 2021 17:09:08 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <84A0BAE9-0553-4D19-9F48-535A4B9473D3@macmic.franken.de> References: <202101261501.10QF16hV000586@gitrepo.freebsd.org> To: Richard Scheffenegger X-Mailer: Apple Mail (2.3654.40.0.2.32) X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=disabled version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on mail-n.franken.de X-Rspamd-Queue-Id: 4DQBWF4NNgz4bsq X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Jan 2021 16:09:13 -0000 > On 26. Jan 2021, at 16:01, Richard Scheffenegger = 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 > AuthorDate: 2021-01-26 13:47:19 +0000 > Commit: Richard Scheffenegger > 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);