m nobody Mon Dec 22 02:23:50 2025 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 4dZMQH2zB2z6Lxt4 for ; Mon, 22 Dec 2025 02:23:51 +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 4dZMQG6FBwz3R7n for ; Mon, 22 Dec 2025 02:23:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766370230; 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=D+bAatYCrdGnccPz3vCMs27zIS3S47kNN35sE+B801s=; b=BPXiv8caQgcHJ0MD22SE/U3zqHsgutRnnSCnWbMxAvWP4axYHYdpVRZcQTt2D9eNyp/rbl 6qlWzv3ts4GzYP+U4oT5aBJuOLRL3bYMSmE1itwOGkeG8hmp4rFc/9Zq1lH6deG1ffCRd1 Jsirnf150P4Z2MmniZyjWCkY/WXWrqG+Z4P4FnkhyiUjZ2oTYtxUIrgqy2gaqIMmjXGt0e fSL8uF5bMx/mueO5G3ImpfTczdu1Yh91PUILFicpznkSqH28XfUCkckChGF5THkFKKp9jA 3u02piFtjasRBbJijjtdowC25g0MV0RVHuYfInb5veHBh8f7tgiV3cPtcCqesQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766370230; 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=D+bAatYCrdGnccPz3vCMs27zIS3S47kNN35sE+B801s=; b=fAi/47BCU+UXR2Do9jMkPi1+J1xxxmYRKseWGM/ddXb6DHJtwGBBuIwp6FaM3e8irzrY8L Si6+7+kxHfkL68Krxb+4BYyasKh1gByEr/qN2qeuYh7WH1CwQEA78PuFKnbUBiOwRqg8xP +yd02QDo0tJVYq5B9WGuIKiQ+E+kxbg/ifQ41kDP/EI90KmADAkocL94GED5Hqy0CJcmDk 4M7o3eOD/3iWL84bACVHlwoTkwQGR4RF3PCWLe2REtTLO1VP58W0ElRHI6XHebR8OeKjEq mytYEcmGCx/iTgxE7gR1rWhszvFN6jMbDmRExDvXrd9u0YGA6zLF6j2vl67eGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766370230; a=rsa-sha256; cv=none; b=Wklu3o54wZL3yRS1LKicmSP3nyoFSFqVTLQ50E4i8n0l+cFvG3WMf5ranZh9ZVFguw/hiu nI8UCmsBCA2wlEcmfy9XFsjOXAj/zMXVxV3WH/ioCizqi6+SH9VTlPUI98X2BvsgeLBdl3 /WoZchMiDdh8pLL2AzzaBltxr2JwdI/Rouapd+G5j6IsqfWd2M9rUqre45Mvpay1fTe7bQ g2yd/Km755yv7+F8EX3kmqOOl9vBzMNbAeVDMQEqsrReUeGK0kV6AIaqP2yuPlQ7aEi/hC DcAePDIhwdRiuJu/MxfDiGshtJ08w5zbL7b5ZSfX+PVd9acHqmNIBE1DIg0tBQ== 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 4dZMQG5J7kz16KN for ; Mon, 22 Dec 2025 02:23:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37ba3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Dec 2025 02:23:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: b275907fa338 - main - if_tuntap: use ifnet_rename_event instead of ifnet_arrival_event 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: b275907fa338b1ed6e9b5b5dd1b5069c36605285 Auto-Submitted: auto-generated Date: Mon, 22 Dec 2025 02:23:50 +0000 Message-Id: <6948abb6.37ba3.54a112e0@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=b275907fa338b1ed6e9b5b5dd1b5069c36605285 commit b275907fa338b1ed6e9b5b5dd1b5069c36605285 Author: Gleb Smirnoff AuthorDate: 2025-12-21 23:57:12 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-22 02:23:14 +0000 if_tuntap: use ifnet_rename_event instead of ifnet_arrival_event --- sys/net/if_tuntap.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/sys/net/if_tuntap.c b/sys/net/if_tuntap.c index 0dc3a58f6ae6..3f8a96311725 100644 --- a/sys/net/if_tuntap.c +++ b/sys/net/if_tuntap.c @@ -179,7 +179,7 @@ struct tuntap_softc { * which are static after setup. */ static struct mtx tunmtx; -static eventhandler_tag arrival_tag; +static eventhandler_tag rename_tag; static eventhandler_tag clone_tag; static int tuntap_osd_jail_slot; static const char tunname[] = "tun"; @@ -741,7 +741,7 @@ tun_uninit(const void *unused __unused) struct tuntap_softc *tp; int i; - EVENTHANDLER_DEREGISTER(ifnet_arrival_event, arrival_tag); + EVENTHANDLER_DEREGISTER(ifnet_rename_event, rename_tag); EVENTHANDLER_DEREGISTER(dev_clone, clone_tag); CURVNET_SET(vnet0); @@ -833,13 +833,10 @@ tuntapmodevent(module_t mod, int type, void *data) [PR_METHOD_REMOVE] = tuntap_prison_remove, }; tuntap_osd_jail_slot = osd_jail_register(NULL, methods); - arrival_tag = EVENTHANDLER_REGISTER(ifnet_arrival_event, - tunrename, 0, 1000); - if (arrival_tag == NULL) - return (ENOMEM); - clone_tag = EVENTHANDLER_REGISTER(dev_clone, tunclone, 0, 1000); - if (clone_tag == NULL) - return (ENOMEM); + rename_tag = EVENTHANDLER_REGISTER(ifnet_rename_event, + tunrename, NULL, EVENTHANDLER_PRI_ANY); + clone_tag = EVENTHANDLER_REGISTER(dev_clone, tunclone, NULL, + EVENTHANDLER_PRI_ANY); break; case MOD_UNLOAD: /* See tun_uninit(). */ @@ -1080,9 +1077,6 @@ tunrename(void *arg __unused, struct ifnet *ifp) struct tuntap_softc *tp; int error; - if ((ifp->if_flags & IFF_RENAMING) == 0) - return; - if (tuntap_driver_from_ifnet(ifp) == NULL) return;