From nobody Tue Apr 14 18:37:18 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 4fwCgL5J48z6ZFPY for ; Tue, 14 Apr 2026 18:37: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fwCgL4JZJz3mL8 for ; Tue, 14 Apr 2026 18:37:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776191838; 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=93if5XhR079HSHdEIawOXwC8TvOPzNDYBWHbP6FMA+U=; b=GXJwitiH4INjQGdwStUUbbAYilwVtFVJZE8/8P+g7cjoy714FlzbjA8kbHtR5DgDZZ7iVm flRtPMTF2bywcvdcmQ/k0R98MRcjw0NTJ5b0k6bcVNKjDDS82X0BT/3XXnoBbC3olb9Ajs 8fKqGYkD92QOkPwpLLe/cCzOcXzzD7W9tbJtaIT6PEMWjcYM3PB872MUf9U/2ZtNBAMNIJ CTK8yJQ20WLG9j0ejkQAzVww8ybQRP2pqmsGDuQ0RYZknVlQyQuykpCfpvXGHFwlo1P2vf o0O1J45uW9ht/kCaFeT3HWVCmi6LHhDoxDUyI5FG2pCEk1oCY9vB+GfuekVADg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776191838; a=rsa-sha256; cv=none; b=mmttAnacv7svukOBhi9RXsrCdFwKOaF5v/oU7SekdkzCsfbojBwkmoE/rPi6KOocZqRqwy Ra28t1vTaVO6KRRa/YfoFrOB64C1tIS2mAJY3uDUIzJswbAREZNbR38UaFra5C7TVr9VHt v+7QNZbt5yypy0y8d8F0Wr+5Q5qUenNKm8IqNfA7sN6xbCBSj2weNeMzMKXmkpNioVbcFa RjXSc2l/5WnFgH2kQuB8ncMDNii/MXcjo/1sEE0b9qPBSLZrl6dE4dNxVRC0ePLBNhmYds toaX149W6CR8KO8qIOY+dnIVTIj7ZvPGG27yDcdwDvylcUgMNzkyW92Y+b57AA== 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=1776191838; 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=93if5XhR079HSHdEIawOXwC8TvOPzNDYBWHbP6FMA+U=; b=B881zjbckyuO7WAF0l++nplIfH3BK1Mc5jNpmAeYAe7US/JLioz47PwRdMOneuewbW+n6k xVdmGL5b+GQL67TM6+UBIniayuzd9kJO3cCKB8+K17UpzxnGFizgNL9r0ida4BvOW5tuZP mNylDRjKLx2BLTJ9WVizZzTQKvcGEmj1sOuIcn23K5YncFrVRj6VHLvlSb5LrpPU5g8Vsu ggHZ7dGcS4KAqYsf0EV6o9sbt8GYhU40go5k7LrwP0uXrpL41D0/+XvvvJjduV4bfJ9Z0u zjqgnBY06eCOek7Fam+hy/qBeDUJph2v52FqjtmzjU3hg4OhYk/5JHab976ZKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fwCgL3vh2z12cl for ; Tue, 14 Apr 2026 18:37:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 398d0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Apr 2026 18:37:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 4fadf2466468 - main - tcp_close: Use in6_pcbdisconnect for INET6 sockets 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4fadf2466468dd6dcb6cf9e3739ed696a18c1bb4 Auto-Submitted: auto-generated Date: Tue, 14 Apr 2026 18:37:18 +0000 Message-Id: <69de895e.398d0.7253ff8b@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4fadf2466468dd6dcb6cf9e3739ed696a18c1bb4 commit 4fadf2466468dd6dcb6cf9e3739ed696a18c1bb4 Author: John Baldwin AuthorDate: 2026-04-14 18:07:51 +0000 Commit: John Baldwin CommitDate: 2026-04-14 18:07:51 +0000 tcp_close: Use in6_pcbdisconnect for INET6 sockets This also fixes the LINT-NOINET builds. Fixes: 40dbb06fa73c ("inpcb: retire INP_DROPPED and in_pcbdrop()") --- sys/netinet/tcp_subr.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 443af020848f..4adc8d859f3e 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -2551,7 +2551,16 @@ tcp_close(struct tcpcb *tp) tcp_timer_stop(tp); if (tp->t_fb->tfb_tcp_timer_stop_all != NULL) tp->t_fb->tfb_tcp_timer_stop_all(tp); +#if defined(INET) && defined(INET6) + if ((inp->inp_vflag & INP_IPV6) != 0) + in6_pcbdisconnect(inp); + else + in_pcbdisconnect(inp); +#elif defined(INET6) + in6_pcbdisconnect(inp); +#else in_pcbdisconnect(inp); +#endif TCPSTAT_INC(tcps_closed); if (tp->t_state != TCPS_CLOSED) tcp_state_change(tp, TCPS_CLOSED);