From nobody Fri Sep 5 18:52:24 2025 X-Original-To: dev-commits-src-all@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 4cJQSp5ZMkz66FFj; Fri, 05 Sep 2025 18:52:26 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJQSn0mvXz3K0t; Fri, 05 Sep 2025 18:52:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757098345; 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=I3+7qn0aQhs73nxnPylh2FBy324+Lz19b3tKySrwET4=; b=VPIKUIInmEV/NhWOEALdFl4R+poBbsBmHQtWa8Bxv35dpWVvgcYBr2fSII5irMJ5VTN6w4 7i9Ptsj3d/nE8dkQd2O8RXSrYA+CsUI68/rG1sRG1YomfJir+HBdwI9yckupyRGiW+mg8r mYjj+bqGVqpZ4eS87yz5vyc3m8ONUMvjNtoTi/JXiXGc8Q1pDuUvcTlNLPP06rG4MOfBbf vDRLAIpNbDStZilPhuHPj8nOF6BBpJAJm4Cse51PC0yq2//CqM/0UrnbqVqIzh2Yv+l5sM BZBo7KWEt9VytjKtYUUWiAcJCEX6apl78aehlee9HbvZS2hVHr3RNA4UlQVlhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757098345; 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=I3+7qn0aQhs73nxnPylh2FBy324+Lz19b3tKySrwET4=; b=l55X0tk+/TkviWvWi8viswUudnGWtVkEu9vxvgIv+ofAHjUhcCFD2bLErQdzWWXuH+HiR1 ViUeVSmaOstNN0x5zF8lwPmIFVqxinc3ONE8ASn5tmLdjm5C1l/0YxW4VBGFmxUhmt/bi+ Rc2AqdKJJ1t4SWWN2u69wJNX5QErVRIW8FFbFzC7xBd0+9bDkseyYnSmmD5zLAMu9eDwFI OLx/gRJ4fERwuXy2EpE30F7spU+Li4MjTJlB67OtOihkWWsO2UDRjeg9cGNimY9YbqLifr yFr0gmaKM5SejgxdiH37VSJPgIFOXnr33KFK9bGNqIfjCw9xHU4LMU9gHcWXqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757098345; a=rsa-sha256; cv=none; b=m4s8mOtdxJqPRa6tvUWKdjhyy0OZhL2W0FBkBKWgwxRAYdq/zBkLR4XnsGWpqiJMQ2GTiQ /od04rqxmyzp5NgmjtSLmgTb+MQgvX/tBZdbeOcA1ccx3aX2hJZ4Uj6Q+jSdUJw+skLMQC sLp1n9IzRVXLnJGnsf051PnP5a4547BGFJ21EGSg3+7Cz+9dhiqJF1WbM4EAtXrQSSEJxu /mgi6ZkEBANrbVJvNdDZQ4sjZUm8cqqDQ7m/vAvu2YEHnbaFoi5vXe/ZoEafG3YDDP7Asl 8ddvOuLsYSaleGdp3u/98O1kJFq0MZHLHWEEgJCO6xtP3ryyPUVd4WfiUZ9faw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cJQSn0KxMz118B; Fri, 05 Sep 2025 18:52: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 585IqOfv016208; Fri, 5 Sep 2025 18:52:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585IqOfL016205; Fri, 5 Sep 2025 18:52:24 GMT (envelope-from git) Date: Fri, 5 Sep 2025 18:52:24 GMT Message-Id: <202509051852.585IqOfL016205@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: 2871bc271ec1 - stable/14 - rack, bbr: minor cleanup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/14 X-Git-Reftype: branch X-Git-Commit: 2871bc271ec17125dce0d35b8bf76f679d99d18d Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=2871bc271ec17125dce0d35b8bf76f679d99d18d commit 2871bc271ec17125dce0d35b8bf76f679d99d18d Author: Michael Tuexen AuthorDate: 2025-08-06 10:24:54 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 18:52:00 +0000 rack, bbr: minor cleanup No functional change intended. Reviewed by: Nick Banks Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D51734 (cherry picked from commit 717bbade24857fd52724e9bb5ffdcfa0310f0a48) --- 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 e5ccc7ebb236..d39ededc99d1 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