From nobody Thu Mar 12 16:40:55 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 4fWtfH4dgkz6Vckh for ; Thu, 12 Mar 2026 16:40:55 +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 4fWtfH1Xvkz3Fls for ; Thu, 12 Mar 2026 16:40:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773333655; 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=iGVts4BzPYlqMrMI7YB8nGNLp1ZT8GGSRXkd0x+9eHA=; b=IEZ8zcAaZUlyJV+7Ih5IKD9TKfqks0sQyjk37HkNVIkngYL6KNtZRVlq8FC+LpuV932gJJ AtuYIjBP6y0ilpMSEC5aMgdrxr8B55uqCMLWtnFhOXI5gTcs1yMo3eEr3mRyOiQas+Jna3 VCxZ2xt+ZHrKGrgeqgBLSBzPccGETurKPBWFpkEFwLO/EWWtmaq4K1k2zXUmkkDM2wU3Cj F/6fuuUF4IcVqXKDhZ1Jz6ojNjZbqiY8LVx6Tq0bOLN0SlknmStceRJ4a670nyLP15b8h/ 0qOetGId8LtJBwrDoT+8gSmIDIQxmXUggU8+ec4moYNGSgC/gIkSYX9hSO4p1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773333655; a=rsa-sha256; cv=none; b=XFaGihPgNB9EzbGtpn6RXwSxOKGtFRGq50ICqk/F6n08zJCQqR886YrSyKd7IhgVC1Dyoz oPIKzS8o04bvO89jzwJ5jv2+SxTR6xGooYG27N0X7IfsrZanwQt0i7po9RmpN5khWT5Cpz oevxrTzPn62gQQaz1yj0nRCbxrlTa2VvJkmX4zY7nb38J7SyH377otjxVoP/iANZkBrqDb gkZg/O/5/B0lZGELVOaM47eyT0pg132UhcA80es7Jj5GraUvcrURbL3yoTKsnCAOcKo5qN fDAT/mkY0iI1n9znl96n6t+GymVXRQjFfvRjPHuz9Ln8TdF9gbXDZXKPrVDA0A== 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=1773333655; 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=iGVts4BzPYlqMrMI7YB8nGNLp1ZT8GGSRXkd0x+9eHA=; b=A+WVc2YqlhjwzvDxvERnU0NB9qkAianIBwHAN5+0UQmFmOeqQJ9sefkX4WhfdvLO0OhWRn 52pHRcW2KlczwIgIhWgFgZivHncirGWQpgiCuHim0cekxN5foMrP8B9dh1yiSxHzs6Wn80 wQrjCHM7z838ghig9ZlBTR+77UWnsI9JrmjfPot6QRZl7VuQl7Uv59SRHhN5XdAfARMZJH 22GOVDEzxmZIYi8kqfModRB34KV2X7V7lm+lUIEmeQBW7spEY5j7ZRweJtuEoL8SzXksQn moX8/S05SCcNuoifhoUh3ODzr74h76QajVeR4nHF901OpMojax/soYQPXP+Rpg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWtfH16d7ztXg for ; Thu, 12 Mar 2026 16:40:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45065 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Mar 2026 16:40:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 815ef05284d1 - main - netinet: remove _WANT_INPCB and _WANT_TCPCB 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 815ef05284d184d83613adcf60def403607be6a0 Auto-Submitted: auto-generated Date: Thu, 12 Mar 2026 16:40:55 +0000 Message-Id: <69b2ec97.45065.2a0d689@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=815ef05284d184d83613adcf60def403607be6a0 commit 815ef05284d184d83613adcf60def403607be6a0 Author: Gleb Smirnoff AuthorDate: 2026-03-12 04:48:06 +0000 Commit: Gleb Smirnoff CommitDate: 2026-03-12 16:37:53 +0000 netinet: remove _WANT_INPCB and _WANT_TCPCB These were hacks since FreeBSD 12 that provided some transition period for utilities to migrate from reading kernel memory via kvm(3) to sysctl(3) based APIs. The transition period is over. --- sys/netinet/cc/cc.h | 8 ++++---- sys/netinet/in_pcb.h | 2 +- sys/netinet/tcp_var.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/netinet/cc/cc.h b/sys/netinet/cc/cc.h index 890bea69a14b..fa175166c9ee 100644 --- a/sys/netinet/cc/cc.h +++ b/sys/netinet/cc/cc.h @@ -86,7 +86,7 @@ int cc_register_algo(struct cc_algo *add_cc); int cc_deregister_algo(struct cc_algo *remove_cc); #endif /* _KERNEL */ -#if defined(_KERNEL) || defined(_WANT_TCPCB) +#if defined(_KERNEL) struct cc_var { void *cc_data; /* Per-connection private CC algorithm data. */ int bytes_this_ack; /* # bytes acked by the current ACK. */ @@ -112,15 +112,15 @@ struct cc_var { #define CCF_HYSTART_CAN_SH_CWND 0x0800 /* Can hystart when going CSS -> CA slam the cwnd */ #define CCF_HYSTART_CONS_SSTH 0x1000 /* Should hystart use the more conservative ssthresh */ -#endif /* defined(_KERNEL) || defined(_WANT_TCPCB) */ +#endif /* defined(_KERNEL) */ typedef enum { -#if defined(_KERNEL) || defined(_WANT_TCPCB) +#if defined(_KERNEL) /* ACK types passed to the ack_received() hook. */ CC_ACK = 0x0001, /* Regular in sequence ACK. */ CC_DUPACK = 0x0002, /* Duplicate ACK. */ CC_PARTIALACK = 0x0004, /* Not yet. */ CC_SACK = 0x0008, /* Not yet. */ -#endif /* defined(_KERNEL) || defined(_WANT_TCPCB) */ +#endif /* defined(_KERNEL) */ /* Congestion signal types passed to the cong_signal() hook. */ CC_ECN = 0x0100, /* ECN marked packet received. */ CC_RTO = 0x0200, /* RTO fired. */ diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index 975b8129c70d..cd7a7303865f 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -128,7 +128,7 @@ struct in_conninfo { #define inc6_laddr inc_ie.ie6_laddr #define inc6_zoneid inc_ie.ie6_zoneid -#if defined(_KERNEL) || defined(_WANT_INPCB) +#if defined(_KERNEL) /* * struct inpcb captures the network layer state for TCP, UDP, and raw IPv4 and * IPv6 sockets. In the case of TCP and UDP, further per-connection state is diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index 7f836f5a1df4..8dff330cb46b 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -85,7 +85,7 @@ #define TCP_EI_BITS_RST_IN_FR 0x200 /* a front state reset */ #define TCP_EI_BITS_2MS_TIMER 0x400 /* 2 MSL timer expired */ -#if defined(_KERNEL) || defined(_WANT_TCPCB) +#if defined(_KERNEL) #include #include @@ -500,7 +500,7 @@ struct tcpcb { uint64_t tcp_proc_time[TCP_NUM_CNT_COUNTERS]; #endif }; -#endif /* _KERNEL || _WANT_TCPCB */ +#endif /* _KERNEL */ #ifdef _KERNEL struct tcptemp {