From nobody Wed Oct 28 20:41:31 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 4jFK5l5yGwz6x71Q for ; Wed, 28 Oct 2026 20:41:31 +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 4jFK5l3Xvsz4b4n for ; Wed, 28 Oct 2026 20:41:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793220091; 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=iqbbbzw9Upd6v73dAaLIKoezdQDhD9vSA/yEk0v1yC8=; b=K3qvBDjzdDq9HvYOax1Zf7iFixhUaN1p1LqLS4GpzGsuVUG5SJPgQnPjM/ynl1Kp2B5dEC 20qM0S2n7dj0T1jTnbvetas/gvR/o4gHKFO6/AXyMABIZAvwNLc7s+qZsC3yx9+vlvwBNz oVNMg0lHNrfxDfye1HJMdaW0upHSPqYCTXqjSD1RFNRLWLUq3gDzpJARpMULe880i55rFI bLlbezM+PICmqEGWd3vwHIOqJopVjUFtmIfnK3Rkp2GUCcE+ODeOhUdLrptKCndSREZb9t TBn7OLLUznBJeKcPDr0UmNn6S+dmfCRtawNqLeKNkZj9C88Vuzqk70PJlN7pGg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793220091; b=HPT3qPUJ3LwOnco+D2hKNnHXddKuNzJ4SeddxkO/RjWcECDF3EH/2ek+JPVEDyH/rSJdEh IVGyCV2aRzpNxvGKAEV9ReubQvRLC+xuWTS1mKH4D47GOigtWlbmSsLeGXryuHKynFPesa 9G5Qi9xweASI+ckN21b9Hs5STSpoHoLe6T6gmcOI4nPu7DlNTNdZWy5m6mgEwiIdfyLawv h5xArWKwbcuMZ/diSGbAKIcFI5Ybjb92gQSQgTb8Tpm/kqXObv28RinF3B5L0VmAMrUcf0 dFiHKKzMFmdXowCAQkbHXfaUp5lBmSI1YqP+0SXWMHHHobQLDKhyfQ/0sabLUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793220091; 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=iqbbbzw9Upd6v73dAaLIKoezdQDhD9vSA/yEk0v1yC8=; b=kDWbju4tvNmTZjG7sEVgW0o5gg0qUd724RU0v/S3Ae14OGsNWy6VWpFyeWS5sHK6ZgJ1tW z5ACj7eAoX/6SYO7v4dRmB4vgXfNA0K/ts5yFKtpRYTTTbBFErxSN+j1vADwuS99zDApHO H4zHlr/Qx3o2DAjT0NXxETYzlEUtfIy7kIDqsmgajzVmHfU5gGt0pRzPV/5PMS4g9OE5eI WpMMxzM+iRGo+j0HQH0yQk+kMu5kud5PTvafkxdkSlmbR7+IbCrAfewgMktXNTVvUzS0QD i98Thht1adAOFFkFgWx9VGmENEdRO1nFnFSasTKcvwZb8VQa0blYtCzaVNlx/A== 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 4jFK5l2wlkz1Mrm for ; Wed, 28 Oct 2026 20:41:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d17a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 28 Oct 2026 20:41:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: R. Christian McDonald Subject: git: 2f5596d28733 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 2f5596d2873325b21cc0f980155d021060858d89 Auto-Submitted: auto-generated Date: Wed, 28 Oct 2026 20:41:31 +0000 Message-Id: <6ae25dfb.1d17a.3815b505@gitrepo.freebsd.org> The branch stable/14 has been updated by rcm: URL: https://cgit.FreeBSD.org/src/commit/?id=2f5596d2873325b21cc0f980155d021060858d89 commit 2f5596d2873325b21cc0f980155d021060858d89 Author: R. Christian McDonald AuthorDate: 2026-10-10 13:13:22 +0000 Commit: R. Christian McDonald CommitDate: 2026-10-28 20:38:05 +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 80c2816b808a..7b844c8861d7 100644 --- a/sys/net/if_me.c +++ b/sys/net/if_me.c @@ -126,7 +126,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