From nobody Mon Apr 15 21:54:28 2024 X-Original-To: dev-commits-src-main@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 4VJLYJ3gTYz5H9nH; Mon, 15 Apr 2024 21:54:28 +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 4VJLYJ38kxz4l80; Mon, 15 Apr 2024 21:54:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713218068; 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=O4NdQXoRfDK+txTQyw/3/01lUcnW9U+P/46i311+WCI=; b=H4OH6H1mYvn20qh+CcsTtQjD2d/v5hMidnAiEQsgtLc8L88MUOpthjQEQW1RGFEA7vU1Nd qAgygaOYfWC/lgBjLJB7hymJ6gdRoijOB1VxDDKsYD2oqsHyMVHEaDVwkqqEaofjNDHmln gIRq2TMhwH5DeJMnDCrT9CHpo0K43BX95S5AARJPdQefhCP/tl4ccgJMg+fVYCsvuhHZjx aiBUK90Nv6sGr1b7JsXhbIQj+bPPecLur8AUcUUE2q0R6qcE98n+8IWKw9RA17XcnC9+vi 4J4jGeenPCZlGWJaVzm/09efmAqny6jKtskKsFGksYN8hNyVMEhNW5+OhGG9eA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713218068; a=rsa-sha256; cv=none; b=AaXvDx/YQ8qbz9ohgRHlRBUt6yo/hoNY+DYg5wmEUamQYZbS17oF5F30CUMqemL0up4DvB x+UkZCQaP4CT/06AmswW8y6VXTLm62xuWoSAbEyAY49+vHWD2tmwpSOmwNCe3Tl7qA+v4s hEoOvTDOJxQJzQ6Q9oIWjgQfTgzla7VfcDqWTPfZ+2g6vsKT37SkHOejihfqweLxX2tWxf IpjmxnHk2XQtpBOveJ4TKIcfk1BThZ8II1Enfw8LLsNtggkz1u/ABQsEAByIhRYgjFytIE KB2GoLfTNADxi/CC4zECTyObSj7/nBG8iac+x6AchsrT+wjBr2EI7QptyMbHdQ== 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=1713218068; 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=O4NdQXoRfDK+txTQyw/3/01lUcnW9U+P/46i311+WCI=; b=XB21wgbP63qOIZYE2zUnSt6dIzwBT2Y6KHa8M7wDo3ySQ6Q4iLYNAU/N2j3EcCFr4qyBsv NBO4o17p435UKhG9Zms47ayN9kainYsRyYgZO6M03USzsIhuEOZGuiuuxroSErsrUCPGs3 am0+mw9IO7LJg7mOkNviIso80AcJaNYJxWa13suWbmRJFwqnPwhzhBg/pOP+5C2mYUh3SI wi+iae93DCDckAQdm5klaBFAv3st12/Z3AngqQRGiB1xoxfaAcp82UcCHF83yCdPPB6Mej PB+JTuy8UYXT5EamYoYmBeYHbx4aGXLzzpPjFtLrWBM9LyImdgteWPfbAitZNQ== 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 4VJLYJ2jKgzGpb; Mon, 15 Apr 2024 21:54:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43FLsSwg064295; Mon, 15 Apr 2024 21:54:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43FLsS5J064292; Mon, 15 Apr 2024 21:54:28 GMT (envelope-from git) Date: Mon, 15 Apr 2024 21:54:28 GMT Message-Id: <202404152154.43FLsS5J064292@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 605a00660ead - main - tcp bbr: improve code consistency List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 605a00660eadb210ed76d49df551f3f33bbb4da7 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=605a00660eadb210ed76d49df551f3f33bbb4da7 commit 605a00660eadb210ed76d49df551f3f33bbb4da7 Author: Michael Tuexen AuthorDate: 2024-04-15 21:52:08 +0000 Commit: Michael Tuexen CommitDate: 2024-04-15 21:52:08 +0000 tcp bbr: improve code consistency Improve code consistency with the RACK stack. Reviewed by: gallatin, rscheff MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D44800 --- 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 4be12e824926..06e80db4a0eb 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -11807,7 +11807,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; @@ -13590,12 +13590,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.