From nobody Thu Aug 01 20:43:18 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WZgsL6zRTz5RQmn; Thu, 01 Aug 2024 20:43:18 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WZgsL6QHKz4MBp; Thu, 1 Aug 2024 20:43:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722544998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4jneHdxRaFsL/2fJGLq6FSUgWBMSY1wJuOv3jKwKg5M=; b=JiWkT931MHWIAGuFW3Y/GcgmOWrdA+pDkHjMXL2YmrfzEgvmK6ylu0J/ICgxxsKLUzYGjs wcpGR8vN1Kb9D6TF+ntiLIquPu0diWXvYC0dKfp60TZPhxgJqklxdTXodDLC4ExXHnTVWk 0Lm5HCDfutsNduDgxUY5Q1g7g3yTtA0T+k/QFLK9Xn1N791EnMBTyr1pXMGtLJfC+8/zPM PJFVERCNFCcMbL6Z0ma2hHlJIstyd2/mD6wnMbJv53M+tRuRX8iq9K16BU/w7yR30WqTqZ gmlCliWnM9OaZNZzrvgxTUkei0VQU8Iu6pg5zvquF4dGjknzvxn9ddfqNtlmlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722544998; a=rsa-sha256; cv=none; b=KYlxt9BsAwjaDxqe1M2hs/5wxG6EoSh+gwsatCY18g4NX8SrL5wFhu583zVFG6zDukIm7S hLD2kEHKF6qN5ZA84PQaqaxIfmkFjOgTrQblVZ9Tq7g00DdWarVSUB0wE00CXf7nuypmtV GziBvEqBWzjg63vkh9DG953Xici/RDdxADomZPeEOD/Z+ayQD51H3aozQkaPW1ygl6tXLe cXPzaMGzNfS2bIXIGkBz1dniZdQY2CUVJlqP+nBHEcXs+pyy7ZZbJ0M+IWwBjawtiUyNf9 py4fMk7Ha9TTlopmnWO/FWojvfjIqVWF43twE4TIvAtkVuqYz/NgGtvIogSnsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722544998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4jneHdxRaFsL/2fJGLq6FSUgWBMSY1wJuOv3jKwKg5M=; b=Ife+fUf0mYDi8jw3qVgB1SsB5YDbTFhJep3hiBmcSrwpyB4jhPxIA5wXYLYUNTDc+eXrKu I/PB1j0ufpTaHh4Hr1CKTqFIXbG4N6zlpeIiXaek/83i5x4AX2u0Yv2H8SVaQxdMZRSOwy P4SAWtknLhQU04FWVGrorZKXcFg6lbmpFAWx8uJO1RsDsh8tCKtNkZBg2ER3uLJ6AABAbf lySGKgPcZTOdOcGCTb8aCkEE/wyrziFdRK3tcvkXPSF7elGc+EoVp4VEzsRS5s5zP104+X qt7Qp+Z++r9GWk60IrjUj0SDw1eIOlgxd3qNM59JF6aWLvA5NO9jMm9D11hT7A== 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 4WZgsL61hzz10LX; Thu, 1 Aug 2024 20:43:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 471KhIAW054726; Thu, 1 Aug 2024 20:43:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 471KhIYh054723; Thu, 1 Aug 2024 20:43:18 GMT (envelope-from git) Date: Thu, 1 Aug 2024 20:43:18 GMT Message-Id: <202408012043.471KhIYh054723@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: e5555583b0cf - stable/13 - tcp bbr: improve code consistency List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e5555583b0cf71c506fdf8d121beca79c38477c9 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=e5555583b0cf71c506fdf8d121beca79c38477c9 commit e5555583b0cf71c506fdf8d121beca79c38477c9 Author: Michael Tuexen AuthorDate: 2024-04-15 21:52:08 +0000 Commit: Michael Tuexen CommitDate: 2024-08-01 20:42:52 +0000 tcp bbr: improve code consistency Improve code consistency with the RACK stack. Reviewed by: gallatin, rscheff Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D44800 (cherry picked from commit 605a00660eadb210ed76d49df551f3f33bbb4da7) --- sys/netinet/tcp_stacks/bbr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 805ffa492c56..8fde062c0dc7 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -11920,7 +11920,7 @@ bbr_output_wtime(struct tcpcb *tp, const struct timeval *tv) uint32_t recwin, sendwin; int32_t sb_offset; int32_t flags, abandon, error = 0; - struct tcp_log_buffer *lgb = NULL; + struct tcp_log_buffer *lgb; struct mbuf *m; struct mbuf *mb; uint32_t if_hw_tsomaxsegcount = 0; @@ -13732,12 +13732,12 @@ send: mtu = inp->inp_route.ro_nh->nh_mtu; } #endif /* INET */ -out: - if (lgb) { lgb->tlb_errno = error; lgb = NULL; } + +out: /* * In transmit state, time the transmission and arrange for the * retransmit. In persist state, just set snd_max.