From owner-dev-commits-src-main@freebsd.org  Tue Jan 26 15:01:06 2021
Return-Path: <owner-dev-commits-src-main@freebsd.org>
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 D70754F222A;
 Tue, 26 Jan 2021 15:01:06 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4DQ90f5pyVz4Vky;
 Tue, 26 Jan 2021 15:01:06 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:5])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BA70336CE;
 Tue, 26 Jan 2021 15:01:06 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
 by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 10QF16XO000587;
 Tue, 26 Jan 2021 15:01:06 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10QF16hV000586;
 Tue, 26 Jan 2021 15:01:06 GMT (envelope-from git)
Date: Tue, 26 Jan 2021 15:01:06 GMT
Message-Id: <202101261501.10QF16hV000586@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
 dev-commits-src-main@FreeBSD.org
From: Richard Scheffenegger <rscheff@FreeBSD.org>
Subject: git: 84761f3df508 - main - Adjust line length in tcp_prr_partialack
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: rscheff
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 84761f3df508aed50783b60f028af9d98a684b41
Auto-Submitted: auto-generated
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
 <dev-commits-src-main.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-main>, 
 <mailto:dev-commits-src-main-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-main/>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Help: <mailto:dev-commits-src-main-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main>, 
 <mailto:dev-commits-src-main-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Jan 2021 15:01:06 -0000

The branch main has been updated by rscheff:

URL: https://cgit.FreeBSD.org/src/commit/?id=84761f3df508aed50783b60f028af9d98a684b41

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

    Adjust line length in tcp_prr_partialack
    
    Summary:
    Wrap lines before column 80 in new prr code checked in recently.
    
    No functional changes.
    
    Reviewers: tuexen, rrs, jtl, mm, kbowling, #transport
    
    Reviewed By: tuexen, mm, #transport
    
    Subscribers: imp, melifaro
    
    Differential Revision: https://reviews.freebsd.org/D28329
---
 sys/netinet/tcp_input.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

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 = (tp->sackhint.prr_delivered * tp->snd_ssthresh / tp->sackhint.recover_fs) -
-		    tp->sackhint.sack_bytes_rexmit;
+		snd_cnt = (tp->sackhint.prr_delivered * tp->snd_ssthresh /
+		    tp->sackhint.recover_fs) - tp->sackhint.sack_bytes_rexmit;
 	else {
 		if (V_tcp_do_prr_conservative)
-			limit = tp->sackhint.prr_delivered - tp->sackhint.sack_bytes_rexmit;
+			limit = tp->sackhint.prr_delivered -
+			    tp->sackhint.sack_bytes_rexmit;
 		else
-			if ((tp->sackhint.prr_delivered - tp->sackhint.sack_bytes_rexmit) > del_data)
-				limit = tp->sackhint.prr_delivered - tp->sackhint.sack_bytes_rexmit + maxseg;
+			if ((tp->sackhint.prr_delivered -
+			    tp->sackhint.sack_bytes_rexmit) > del_data)
+				limit = tp->sackhint.prr_delivered -
+				    tp->sackhint.sack_bytes_rexmit + maxseg;
 			else
 				limit = del_data + maxseg;
 		snd_cnt = min((tp->snd_ssthresh - pipe), limit);