From nobody Wed Oct 28 20:35:50 2026 X-Original-To: dev-commits-src-branches@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 4jFJzB6VL7z6x6K8 for ; Wed, 28 Oct 2026 20:35:50 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jFJzB4v9Jz4RLL for ; Wed, 28 Oct 2026 20:35:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793219750; 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=o/ftQZHAS6cdA0V8MPYYrn6e99keQp63oQCZUSauODo=; b=WYjcYVvdagvc/zAUacMWv/+FDwEbCmmtpOUi7Byprmzvgm5NDc8o2TkaDljPsEt88DVSUd bKqYu9FaksZt26Lz+A73SjqoxWyy9WTPGOchHoMtcrwO+QNclJxnC6av+WEagXYdR2UBHe qqqOW/1d3X/QIBJUgxOk/5SfWJdMmKoBDc4DSAyuVXCioy+OzmrC5utJ2LhXCPcdU/EipL u0ZoD+VZdG0WLc305gEi47iPHaYDmvt3E2lPJrEvi1z6TkN6WZsH5nXK6ePUQ+IG3VwSqj GX7/SrOnBd4CHpBARektzb0IM78nqO4LLTi3Jz6BOvWMsZCs8gubGC69nepDTw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793219750; b=ncuSl0/3vt+4VYj5V90EJDL+2rYV0cNoVV7FHqW+VnQqz6iKkNsjzuSCsDamQQx+f5/LcP ooZD76nJG8czxJNZqHGQ2tPCSPx9V//1eck/+OhZs80RNHjdPUlRSpaB32oBNtVwznUdS2 kG5gwfDMg1OQOWyeXgSyFpNFu3mxNWksKBiSVN0RGNdkgKYi91gocfMX2tQT5mTIYoDd5W EGzAcaADqAlLms0KQcR3CfEP0Ltz61GCs7AyM7SHHlluTVghlNxAZRxUV/PztM8Vhl9a8E da5xbjsXMP3lczsfKaPcgskErWeOO9C3nwVp4I3ijWj1gDrq4Xn6IyTGl3fbKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793219750; 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=o/ftQZHAS6cdA0V8MPYYrn6e99keQp63oQCZUSauODo=; b=cmHDoOV85lYNjTmIMQIrGJ8hXFkfQ3p+GKofA6gUGmKV5UHwhFg9wc53H7cqO+pA5vXsEV QTR7CqaBSHSqtmiKNhLiOzhsq5+YV40y4gUzk8DrHYeh1L8xSAyk4XeXmF3nr0U6yGf6mB Bn/Xn4Y/dSK8R4AJsHytQK9d4C8G0YGsZqw8q/DWX9cJ8aJyV26Lp5zu3Z6QTtam9t/Yum YEZHZU9CSxR2cc1AaeaRvhihb5rdRWiqF4w1xDsLHAFWm1nvntVovsK54QUIeVpI6LMnB2 547f35p4Dz6wuamfhcsw2rt1Vs96IpFklPUzWzDijwGzvx+mom9/bSZiChzdbQ== 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 4jFJzB4YsQz1Mv1 for ; Wed, 28 Oct 2026 20:35:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19cff by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 28 Oct 2026 20:35:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: R. Christian McDonald Subject: git: e54bcac6ff68 - stable/15 - if_me: Do not reuse gre(4)'s static sysctl OID number List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository 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/stable/15 X-Git-Reftype: branch X-Git-Commit: e54bcac6ff68f86d4ef104376d6ffe50bfa7c80c Auto-Submitted: auto-generated Date: Wed, 28 Oct 2026 20:35:50 +0000 Message-Id: <6ae25ca6.19cff.3fe7df04@gitrepo.freebsd.org> The branch stable/15 has been updated by rcm: URL: https://cgit.FreeBSD.org/src/commit/?id=e54bcac6ff68f86d4ef104376d6ffe50bfa7c80c commit e54bcac6ff68f86d4ef104376d6ffe50bfa7c80c Author: R. Christian McDonald AuthorDate: 2026-10-10 13:13:22 +0000 Commit: R. Christian McDonald CommitDate: 2026-10-28 20:34:10 +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 (cherry picked from commit 21f2245de21931cf388120d8cb464442aaa84c6f) --- 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