From nobody Wed Aug 06 08:27:25 2025 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 4bxk1T2Xssz63PVn; Wed, 06 Aug 2025 08:27:25 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bxk1T1s7Xz49Xy; Wed, 06 Aug 2025 08:27:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754468845; 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=SVfVj09fDRlAqY3/+68X2bgTSpWH1gBxq64OJt4f6UA=; b=WJMXScBv7cFR2XHVxwPSHjWbQcj7JouyDw45mjzeqLY7KQkx0GwLhx/UuQFYRh+rClGVBk 9Ukpwq95WV+byNH1mPavBKylHSgBfccBmIfWHtUBLpxAASvlNwQmVvtpaNDXif005CEfBd 6Srzr8retKH5NIyV1fn0iGzy3e57zUsFw2gL4qa+vMuWi63r7ZjYXkVg9rpmhuOugCEd9K 1pVfccEB3lRJBmgIdlFyjxjy4KUnZy8GGVIIBGNu4l3ZjdjqEXOCUYX5+koLSD/ZPy9dCy g1OPNki4Kyx2OdhnChziAb4E0DgKH2P4LIMn9M4oBsIA9JB+qM1pTRpJF5EK9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754468845; 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=SVfVj09fDRlAqY3/+68X2bgTSpWH1gBxq64OJt4f6UA=; b=nJaxA8ApeWAshCScohhDEj+g9gkmZZBtvlBY2KEdwpYso8WTdk6UOdIMGQRht8MiNdtK9I o3ptbCqYNZ2zUlfEhJPL4WZ/wiCwrABBHTlCaJKnO0xUuo9XM7drDX0JXAlUmQrBGwevFB kxWTcUDqr4FcG9WbYZ856Hc2X7P+jWWo1u1dgZ/YfQBNAxefYN4whOMaBfH0JCOw5eR0+p zX/XtWaYNosZeOvpQFT3jklPKVhwbBzr4OoayAG/yeihLqY/HCU6wfBjrRSQjpJj5Egtwz ITbFx+DQlQZXEtHe2OefZ2pe9E4Y94Z9VW5La5hfaVBttXaqgxZ8efWH02EJWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754468845; a=rsa-sha256; cv=none; b=rhSQq7iU/tv/slPn72XrsiAN9vEthR2bvXzd4YiPUucJCq/GQv8keyGGAC7aOVE12b3o1f 5pPW/uodEaoKca/YPMuesxDhYTSWEW25zu6KnDtGHWafOPfA6Etm8Sl0+q61l51q6SRzd+ Qw5CX01NxQiI7Zv/UxWT08zSuY29ACjpOAyyo+s5rjCnzngDVlOmJJqr7tPQ6CYOMJecUX pGLWumoTpNUrPcXr5th7sPGJCNuhDKSL6ku40kzOfRxXCQLoMCxUj7nX6K5Uva0O6cR0i8 axBE7M3Mg3sbkSuUj4l5vUNJjHWAY+R0X61NRfcV7ShALqCY2U0ctveGIGVshw== 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 4bxk1T1JBPz1Bly; Wed, 06 Aug 2025 08:27:25 +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 5768RPVN042475; Wed, 6 Aug 2025 08:27:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5768RPoW042472; Wed, 6 Aug 2025 08:27:25 GMT (envelope-from git) Date: Wed, 6 Aug 2025 08:27:25 GMT Message-Id: <202508060827.5768RPoW042472@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: 717bbade2485 - main - rack, bbr: minor cleanup 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: 717bbade24857fd52724e9bb5ffdcfa0310f0a48 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=717bbade24857fd52724e9bb5ffdcfa0310f0a48 commit 717bbade24857fd52724e9bb5ffdcfa0310f0a48 Author: Michael Tuexen AuthorDate: 2025-08-06 10:24:54 +0000 Commit: Michael Tuexen CommitDate: 2025-08-06 10:24:54 +0000 rack, bbr: minor cleanup No functional change intended. Reviewed by: Nick Banks MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D51734 --- sys/netinet/tcp_stacks/rack_bbr_common.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack_bbr_common.c b/sys/netinet/tcp_stacks/rack_bbr_common.c index d1c4ba58bf55..fb013d3d17f0 100644 --- a/sys/netinet/tcp_stacks/rack_bbr_common.c +++ b/sys/netinet/tcp_stacks/rack_bbr_common.c @@ -509,11 +509,9 @@ void ctf_do_dropwithreset(struct mbuf *m, struct tcpcb *tp, struct tcphdr *th, int32_t rstreason, int32_t tlen) { - if (tp != NULL) { - tcp_dropwithreset(m, th, tp, tlen, rstreason); + tcp_dropwithreset(m, th, tp, tlen, rstreason); + if (tp != NULL) INP_WUNLOCK(tptoinpcb(tp)); - } else - tcp_dropwithreset(m, th, NULL, tlen, rstreason); } void