From nobody Sat Oct 10 13:14:59 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 4j242w3rh2z6vgk3 for ; Sat, 10 Oct 2026 13:15:04 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j242w3Fcdz4svY for ; Sat, 10 Oct 2026 13:15:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791638104; 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=LxSqLbTC88JhHFIdCLkeHGYva0anrTezZ7XKnzfuorw=; b=Fnn0AaiC2erCT+fC+b5KZLEaSnZrHG1D7k7xjFxeqlstxuA/gVrMYPWon5N9GRkaHnYu/P pHqOo86k9wWhJE3FVrXcyDxc1xZ7+taNmESUaIaGFfgY8Ane6elAduxWcW0YGG4RHo6HE5 Mp1qyFG4tK6CxPlg4pAJDqF7iJtVfxEAKVazWN9cGJCAzNfQzzjAm2A4ZFVvvD98k3F82P 8BMbrIgOzum+4srSTyrk9YSlpvVPED/MxXw86CI8BAyjjwUV4gxrVIAOPtBYYomw/ovhyU 92TqG9Yel+jl9CJLUaBLvLur0Vqk1cpnXQHxaPNpaBtPGbj3vxj4oMXRaa9Y+A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791638104; b=O/yyMBi4asNbXZOykbpF8ESGkfq6hYULFozgKUlneXVu1hleaHjEaW03ZXz2gkM/HBnYTv mKj6umWIfBXHMRhLewx9mopdfmGU30IqVd5N1v0dRU7HZoI0I6rTlhZKrHI9lL1lanNlzT myjOqZuu/D/iRvAn2tRthSm8f34WscQUhGPN27nJM/DU9tMIzy9IyUFdf2ct71inUup55C DbsJJ3qwhVi37u3kOoP7x8WpqqaRvVWxyQ+jYiGkdvws8RQpSMQyGm82WcMKgny7+InAaF jFC/FMkCYYiN8Cc2jQYQdldL9UiTAbzYnvdJ3YmlagNGe8et8m4lc1iOfK/JeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791638104; 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=LxSqLbTC88JhHFIdCLkeHGYva0anrTezZ7XKnzfuorw=; b=Zykc6QhyfpyTVUFBacWGsdUy5X2YFNFtwlTPpClthQaZ51DlIBamE41TL+uVF+0snwjqjS 9F2PNprcCzh6oEbppdsDo32iX/LNm8JxEsKPcNcJrzIg0U/4bhyV5RojGg4us8Zu8c57Y4 fH3h/BVuKjXxQGUaPZid23Gn4qS2qeYlTw3FgXWawxJUBo0FSU3abd+k8FAlHDRcx//kyT 0vEBl+Z0j41CEUkvO5RGSkcri4A3mReccgHnWuJQZso4WfwEW8vcIkX+BWZsp4tdn4JKZZ I/TUBjgImRWq4TnPmf8EorKGiN36yIvO2uEgHSLUcPHyh+GRjvEj7yRf/JjOuA== 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 4j242w2L2nzxBB for ; Sat, 10 Oct 2026 13:15:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31564 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 10 Oct 2026 13:14:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: R. Christian McDonald Subject: git: 21f2245de219 - main - if_me: Do not reuse gre(4)'s static sysctl OID number List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rcm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 21f2245de21931cf388120d8cb464442aaa84c6f Auto-Submitted: auto-generated Date: Sat, 10 Oct 2026 13:14:59 +0000 Message-Id: <6aca3a53.31564.137f6b52@gitrepo.freebsd.org> The branch main has been updated by rcm: URL: https://cgit.FreeBSD.org/src/commit/?id=21f2245de21931cf388120d8cb464442aaa84c6f commit 21f2245de21931cf388120d8cb464442aaa84c6f Author: R. Christian McDonald AuthorDate: 2026-10-10 13:13:22 +0000 Commit: R. Christian McDonald CommitDate: 2026-10-10 13:13:22 +0000 if_me: Do not reuse gre(4)'s static sysctl OID number if_me(4) registers its net.link.me node with the static OID number IFT_TUNNEL, the same number if_gre(4) has used for net.link.gre since 2003, so the two tunnel drivers collide under net.link. Until d35c4cfad580 that only printed a warning and left two nodes with the same number; since then sysctl_register_oid() panics, so loading if_me after if_gre (or the other way round) takes the box down: kldload if_gre kldload if_me panic: sysctl: OID number(131) is already in use for 'me' Use OID_AUTO like the other tunnel drivers. Nothing addresses the node by number. Reviewed by: ae MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D60536 --- sys/net/if_me.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/if_me.c b/sys/net/if_me.c index b839730d2e37..9e690daab166 100644 --- a/sys/net/if_me.c +++ b/sys/net/if_me.c @@ -125,7 +125,7 @@ static int me_set_tunnel(struct me_softc *, in_addr_t, in_addr_t); static void me_delete_tunnel(struct me_softc *); SYSCTL_DECL(_net_link); -static SYSCTL_NODE(_net_link, IFT_TUNNEL, me, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, +static SYSCTL_NODE(_net_link, OID_AUTO, me, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "Minimal Encapsulation for IP (RFC 2004)"); #ifndef MAX_ME_NEST #define MAX_ME_NEST 1