From nobody Tue Apr 14 18:37:18 2026 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 4fwCgS4zGRz6ZF72 for ; Tue, 14 Apr 2026 18:37:24 +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 4fwCgR65Ttz3m96 for ; Tue, 14 Apr 2026 18:37:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776191843; 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=RfRzB88tGPMA/fP2SBBwkyCEiTDdEcdzu3RR7kvHZG3VyXj3/zn9STdz+ycCUhq2D8wImU fzgrqv3ZH2NJ+62QD5lkt/Eb009bXB/x4QD8LLTDMa0Cy4S6pmCOC1qkkowxrxik1Dj5bw z7+XDMm+Ze23ryhXBqiMp2Vlt6NnJ0JPv2A8py+HSQX1B+kp3sRgBZlYT2HFHXmFH72VIY A/Q1lGM6IGL0Cj0JAanIs6IPa4PgNO6+41pcTqadxmpOWbfu310BbaNzO/VgzvmRBHC/T0 BB6MHlwe2hcTrdHXEyAzpKWuOMwTzPXF1/WjkzgnRCqAL2757d3nGTPs94hsqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776191843; a=rsa-sha256; cv=none; b=fx5ahXKBuGrr0J6IpXXDKHTnCYHLJP5CZ7gCdKxTjcIpqE7xtKZYKyY/rKUiF8bdOcZtMX alGsenUoBrwerk94+TA0VwBiXidw/Y9IaXKbloXcQ9L8/Lzkx8EteS5mqVrzBM7yiHUUdp 0s9nGh9+MLIOhUoX7W1A6BTMcEZrQSdLssbjzHOMgHiapPcPGxMFO2enrgq5CUyH9VMD1E 1kD7AmuHzogMKaelQXoZ5gRbDciL1xfLwX2NpQrplVNnScErUdDO4197oXw6JRvUUOKnTl Q080BP92oTLQm1bmHy2yYMiTCBo8Th/tMybtcghIxymrmSe5fK07XocgSHQbMQ== 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=1776191843; 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=BJATIDGUZ0oIs/w0TS86+m+ynm/GiNPxT/By58zW059sYo98YEj/QBLgQz5HF4ViTansYm Igq9Lda+P2uOJ8Fg7ZzZTDmZnFKiC6FL1qk8bA+6BvdwhhQXIvW6VRV4BVOgcLD2/LYfFZ 31xX+/bED5onZ7K9jF4PTLCFLs7WBqrIcX3y5OPNWK4eMlHLEPMvNv1a7ATVXVkCz/uZoN g9DlFafDyFwPzqQhfyepHA4LCQ+VR7gGGgpqUD2RcJgvtdUC8hab9r33kHisHF4GKvkzcF 0sVnjnoWR1VJCz65fk07QtG8Mk1KXHfPBezNS168GaYU1R/6EDF2HMvs/J8XkQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fwCgR57rWz12JT for ; Tue, 14 Apr 2026 18:37:23 +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 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: 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);