From nobody Thu Jan 15 02:57:19 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 4ds71q3MKqz6PGmP for ; Thu, 15 Jan 2026 02:57:19 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ds71q2PGvz3lcN for ; Thu, 15 Jan 2026 02:57:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768445839; 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=duca8BW5+5tJ5/Me+iktGjMR+3BAN1nHwTElaToaSLY=; b=qV1Y+glf0UVzhRN6WWw7wwTiNcrcBnuZR9AsVNRMbMyxmQHDLljPtPBjtVmAMYrf+fvrIm O+5H8HL11MrtIpVAwtCQAZoIU244L9NjDy69xGReUorrYTqm+SPliR1R6+h+rqEK38z/9h dMgNrq2PmRLOcQ60/uZErSrR/hfCZ66f9y9WrRZQBbSEQrYTFVa9ktKFw4mFSy2DWjSIOm DKUm92BijnRSdNHMFgvC6mosEJOkJzfsNrmRuIcjsARx6oekeUVNbdEXTQ9mNA8MM2jnRO LL7OtR58Miruf0mrKgAfXckDvGlNzi52hSiwKfy+3FeZuSEnBwt0mazcdfmXCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768445839; 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=duca8BW5+5tJ5/Me+iktGjMR+3BAN1nHwTElaToaSLY=; b=nGp41KkXbQF91OuLUhjguprJbpnupWaQt1HqEaNy31zfau01m+kBR6YL1vPJ0GTQs8Etza OprqNebwcB+laPAHg8hxE1JPnFv+KennmCP/LKhqvMgPlsN9koiEm+OgVLm8I4nzr86rLa 8eSnYVAAbNfExCcUkraYjSidt3vLusaQyBg3JGNpoKf7i6fJHnBijs0vibPvICSY977cUW Yfsx9DZ8vlRZTs0aPy3Sn2qGOMHMp8uBo5HYiojp2W8+ufhQPN05y76vE1iRV7xbKVvH7P zGLXAplWt9D3qBqt+x1KFuhPJfg/t8IgpTfyZl+9ZCtceFB3WpQYAHE92HMqzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768445839; a=rsa-sha256; cv=none; b=byvjX6VzPa23/g0UP/uzbJW9OpzeVQT43OpGZ+UCZS49kjsEAXxPIFWSrK4rs9zbRdX1bi SaS5LlCiKw1wgXpBjFV8IQdAo3k9q5y2wBed57zepsnYy6yu71+7rqnGpCqUbns0FoESG6 ZMXPJc73HLHKvJEN1JxKtqfykIjveGILccx8MeoxrvBsva806/oGj6yZePkY0RHWfJleBa A0zrJSO2S6bd+v5CcNOzdAk9JCkvADrOr6U0vWl1k4qChxZwA/v0qw2LisxhWJqof1DGC9 vZqli4zSWkDE+Upxbl3siAL9ZXPMq9HW7otaSwo+Dg6Og1ueQBVg6rscnHPchg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ds71q1kZdz1Np2 for ; Thu, 15 Jan 2026 02:57:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id c980 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 15 Jan 2026 02:57:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 008e5703e184 - main - netinet6: garbage collect OSIOCGIFINFO_IN6 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: 008e5703e184cb5fe2079cfbdef5091add2ab3e1 Auto-Submitted: auto-generated Date: Thu, 15 Jan 2026 02:57:19 +0000 Message-Id: <6968578f.c980.2053c217@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=008e5703e184cb5fe2079cfbdef5091add2ab3e1 commit 008e5703e184cb5fe2079cfbdef5091add2ab3e1 Author: Gleb Smirnoff AuthorDate: 2026-01-08 02:42:02 +0000 Commit: Gleb Smirnoff CommitDate: 2026-01-15 02:57:10 +0000 netinet6: garbage collect OSIOCGIFINFO_IN6 This ioctl has been marked as "old" starting with the original KAME export over 20 years ago and has been hidden under #ifdef _KERNEL since. There is no software that uses it. --- sys/netinet6/in6.c | 1 - sys/netinet6/in6_var.h | 3 --- sys/netinet6/nd6.c | 14 +------------- sys/netinet6/nd6.h | 17 ----------------- 4 files changed, 1 insertion(+), 34 deletions(-) diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index e8b76bdd579b..43452525e992 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -317,7 +317,6 @@ in6_control_ioctl(u_long cmd, void *data, return (error); } /* FALLTHROUGH */ - case OSIOCGIFINFO_IN6: case SIOCGIFINFO_IN6: case SIOCGNBRINFO_IN6: case SIOCGDEFIFACE_IN6: diff --git a/sys/netinet6/in6_var.h b/sys/netinet6/in6_var.h index 0cfdde652c0a..8881885ecf86 100644 --- a/sys/netinet6/in6_var.h +++ b/sys/netinet6/in6_var.h @@ -449,9 +449,6 @@ struct in6_rrenumreq { #define SIOCGIFAFLAG_IN6 _IOWR('i', 73, struct in6_ifreq) -#ifdef _KERNEL -#define OSIOCGIFINFO_IN6 _IOWR('i', 76, struct in6_ondireq) -#endif #define SIOCGIFINFO_IN6 _IOWR('i', 108, struct in6_ndireq) #define SIOCSIFINFO_IN6 _IOWR('i', 109, struct in6_ndireq) #define SIOCSNDFLUSH_IN6 _IOWR('i', 77, struct in6_ifreq) diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index 595e0b4ac54f..04ce9bf6dd55 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -1649,20 +1649,8 @@ nd6_ioctl(u_long cmd, caddr_t data, struct ifnet *ifp) /* XXXGL: ??? */ if (ifp->if_inet6 == NULL) return (EPFNOSUPPORT); - switch (cmd) { - case OSIOCGIFINFO_IN6: #define ND ndi->ndi - /* XXX: old ndp(8) assumes a positive value for linkmtu. */ - bzero(&ND, sizeof(ND)); - ND.linkmtu = IN6_LINKMTU(ifp); - ND.maxmtu = ND_IFINFO(ifp)->maxmtu; - ND.basereachable = ND_IFINFO(ifp)->basereachable; - ND.reachable = ND_IFINFO(ifp)->reachable; - ND.retrans = ND_IFINFO(ifp)->retrans; - ND.flags = ND_IFINFO(ifp)->flags; - ND.recalctm = ND_IFINFO(ifp)->recalctm; - ND.chlim = ND_IFINFO(ifp)->chlim; - break; + switch (cmd) { case SIOCGIFINFO_IN6: ND = *ND_IFINFO(ifp); break; diff --git a/sys/netinet6/nd6.h b/sys/netinet6/nd6.h index 3051397ec33f..0f61e167f480 100644 --- a/sys/netinet6/nd6.h +++ b/sys/netinet6/nd6.h @@ -139,23 +139,6 @@ struct in6_prefix { /* struct sockaddr_in6 advrtr[] */ }; -#ifdef _KERNEL -struct in6_ondireq { - char ifname[IFNAMSIZ]; - struct { - u_int32_t linkmtu; /* LinkMTU */ - u_int32_t maxmtu; /* Upper bound of LinkMTU */ - u_int32_t basereachable; /* BaseReachableTime */ - u_int32_t reachable; /* Reachable Time */ - u_int32_t retrans; /* Retrans Timer */ - u_int32_t flags; /* Flags */ - int recalctm; /* BaseReacable re-calculation timer */ - u_int8_t chlim; /* CurHopLimit */ - u_int8_t receivedra; - } ndi; -}; -#endif - struct in6_ndireq { char ifname[IFNAMSIZ]; struct nd_ifinfo ndi;