From nobody Sun Apr 12 21:46:21 2026 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 4fv3yP4cz8z6Z13K for ; Sun, 12 Apr 2026 21:46:21 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fv3yP2TCpz470r for ; Sun, 12 Apr 2026 21:46:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776030381; 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=FmvIHtE5K4dh8nz10LgNPommnqNfvK0b0NjNwCdrKlI=; b=IGKd8wqh4ZGjgcRr0Jb2V3ZSlF/FCTj8p7q5P31xworxkxZFeyvW/f27LeB0csnde7M0f2 VuSCjyOpRu0egt2D2nfx/hINgrhYab/37/C84Gxgr20by3fCK5uGo2F9osZ2RvWQaZM7va VMdCFfppMeXBZfAm7u78/UnFErT6DAvigKkJIaYlmmBCN0+HPA02KmVGvPIr1zOTxmCVRZ JbJNeSoa5ppAmpE0FR2rY3c9vmYoCTRqZVVnZQkCGw3OuqEBUmVNYGcbiaFA/g7pZ97bde 1nUrhUSfsu1Q1v2EEKHukTbRL5hsJR0Dwl9eJPR76ZRdoZAMKaGgvyQUB2FxgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776030381; a=rsa-sha256; cv=none; b=lsNvXCDrgQdLwcGar9xkfPkCoGoIgH2ETCUNOKG5mkZUQMWScxHaBkriVB+UnhjNaprn0T ZCrAjkk/ANcA2uEiapkEqdmU9bnTSiZcHkfdUFKN2HjR8wHwGYmyaK02SV0timWC9O4Xuv jMhrOfykgkdZSWoew/tcemOH1+poDr/gizH43jZht+nMAA++cqtT6HwDb/AgvznLjQWAiw swjKKQ6QXc29iHW4/TaKKtVaZu0YHkY+0fnU2EauHzO92Jb3O+s2IjldQz0p6jQfsQS0fc Ktn17Kt63I+dClLifsfmCtqRWFlPM8kbl20TVVXvzei73b5UcvcZNYz4Nksg7g== 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=1776030381; 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=FmvIHtE5K4dh8nz10LgNPommnqNfvK0b0NjNwCdrKlI=; b=Jr4v1zhUBqRW2JUCeEvfveiJ7st/h1wlWf2m3dZiur1sdfO8X+zbXR3sE1EoBEaQircURV s43c3mm8hjoeAOSviUzsJCGt1WlewfJDk2t8LT9uCtj5KDGcg/9dKHQcLyh+xrIWuw0iuQ Tyyl5TV6YPU8j/H6wQ0t1YSMuuISWnljIZ3nNgq4CDqjMtqPIO9DnEkcAiaTCXVKFWXm9Y U0JE+rnI+de0eUjctS+gbmq/T3p2LSaVGVm57s3/Db8D5QQVH2wChpgG+JSwoheVHmX1it M2GYgZBbuXGKfVySSvKUqaGo+A07ia9V5eFg0R4hQ8myuJB+SoFcQEQZSg/RzA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fv3yP1sTLzbwp for ; Sun, 12 Apr 2026 21:46:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e119 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 21:46:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 151a1eab3b78 - main - tcp: fix !INVARIANTS build 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 151a1eab3b785129d279af601ed716eda74886a8 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 21:46:21 +0000 Message-Id: <69dc12ad.1e119.59001d23@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=151a1eab3b785129d279af601ed716eda74886a8 commit 151a1eab3b785129d279af601ed716eda74886a8 Author: Gleb Smirnoff AuthorDate: 2026-04-12 21:45:40 +0000 Commit: Gleb Smirnoff CommitDate: 2026-04-12 21:45:40 +0000 tcp: fix !INVARIANTS build Fixes: 40dbb06fa73cac37d57563c07e55efd0cabbd488 --- sys/netinet/tcp_usrreq.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 277f8fa2af36..6a51068d0461 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -2586,11 +2586,10 @@ unhold: static void tcp_disconnect(struct tcpcb *tp) { - struct inpcb *inp = tptoinpcb(tp); struct socket *so = tptosocket(tp); NET_EPOCH_ASSERT(); - INP_WLOCK_ASSERT(inp); + INP_WLOCK_ASSERT(tptoinpcb(tp)); /* * Neither tcp_close() nor tcp_drop() should return NULL, as the