From nobody Thu Mar 06 04:52:41 2025 X-Original-To: dev-commits-src-main@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 4Z7cVL0Ls9z5pS4h; Thu, 06 Mar 2025 04:52:42 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z7cVK3SKZz3By4; Thu, 06 Mar 2025 04:52:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741236761; 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=O2LTymUmbeRRUmplCXRcEbnxVK5djkIAwoUfNQQj9ZY=; b=F6ViP5lJh6rRZH8Og8bB9YHAwmlwQDhfdce9mwZ2oZHuXcEf68ZSVrIfdQLmX0F3rmgcca noAnocfO56n7ZEw5Jo4BP+2QSGq2Cgaaiao3RJfZAN5p7UM2O+vlwFuBFwcqV74jBQb1Fx GKsPY6h67ep8kejuoN1CiHGMCX9LlXMBtCE3joKWrRnaD3Txv+XKgW4NB0B6+JbO6smAjM 4ZwT3YbWe2Vrehc8UvDNcFZwgI1FDqFkOlZjYpG6VSaIRXqCyQFfs8zMNKc7dq91EW8JBH /X4s2k1ZKtRUydnulGGTsMqlimiE2ZL9IVwE74D4EY3OPigEz7kmiuKcl0vtPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741236761; a=rsa-sha256; cv=none; b=ZfzxTXs/yM4687VBPeC93G4e1TmqWeMLFpCWpXWFUt4FooxE+pzBjp6LTGKeoJdwLBUqWs m6dAhRENoXiLNd3+r/7VaV4xklAbCZ26q5oAgzQxXhdcLuJdlf3Hw2ikz5lbUcsJ5FvQ6+ HEK9kXuaae8C7lwV9IuuaVA0sxB3MwqnyijlHUU7N46uIajbHXcA8BoH1HuAa4p6Wfm4xU GZku1QPlKYmGg/DJ59JIxfA9pjlK8if2m7UohvELeyF9TKPL8A67yDKJlVyOd3HiJq4I7D x4hb5R3feKWrhly1NDW+EZ/GNyT7WL2QR+PydSvmEKaft0+afc0aDlXp9wIjKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741236761; 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=O2LTymUmbeRRUmplCXRcEbnxVK5djkIAwoUfNQQj9ZY=; b=rrXVGWodCE5uuahildfSbEUa5CAKcYtp8MuycyOwDsFzVbvqtJkpBBMhJcV7dAbnZwQbbC SL8Kvj3FdB67SdBXri8Il807PNPEkJN/dKVGCZ71dUgxLz8O6U3R4x6pwL9XoBXmAiRLsT NL5zP+HksRsw+jOU7FD+7Ru4zrvwwSD9WORurDwdBG2pxU0yjrr03pyKWEqaPwMr+piVpZ MPHTvJrF+X8BIpE92kE4ywehUv6QwyaXF79WovZrqQkgQr2A1xkoWy3YX9+gzYAYkOA0Uh i+Bp26a+IShxzmhgl8Pc/y5ERmJzHPagIenim6mdFP0kLrqhKMKB1wr4oOX8eg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Z7cVK31k0zcv3; Thu, 06 Mar 2025 04:52:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5264qfeA026392; Thu, 6 Mar 2025 04:52:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5264qfh3026389; Thu, 6 Mar 2025 04:52:41 GMT (envelope-from git) Date: Thu, 6 Mar 2025 04:52:41 GMT Message-Id: <202503060452.5264qfh3026389@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 1ba655149ed0 - main - if_clone: Use static initializers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1ba655149ed0447f93e997a60330d9b962d061f2 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=1ba655149ed0447f93e997a60330d9b962d061f2 commit 1ba655149ed0447f93e997a60330d9b962d061f2 Author: Zhenlei Huang AuthorDate: 2025-03-06 04:51:44 +0000 Commit: Zhenlei Huang CommitDate: 2025-03-06 04:51:44 +0000 if_clone: Use static initializers While here, remove vnet_if_clone_init() which is therefore an empty function. MFC after: 1 week --- sys/net/if.c | 1 - sys/net/if_clone.c | 9 +-------- sys/net/if_clone.h | 1 - 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index ce0c3d5c0616..21e3b1a8576a 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -433,7 +433,6 @@ vnet_if_init(const void *unused __unused) CK_STAILQ_INIT(&V_ifnet); CK_STAILQ_INIT(&V_ifg_head); - vnet_if_clone_init(); } VNET_SYSINIT(vnet_if_init, SI_SUB_INIT_IF, SI_ORDER_SECOND, vnet_if_init, NULL); diff --git a/sys/net/if_clone.c b/sys/net/if_clone.c index 13d89e4e2c59..066547ceeeb3 100644 --- a/sys/net/if_clone.c +++ b/sys/net/if_clone.c @@ -128,7 +128,7 @@ static int ifc_advanced_create_wrapper(struct if_clone *ifc, char *name, size_t static struct mtx if_cloners_mtx; MTX_SYSINIT(if_cloners_lock, &if_cloners_mtx, "if_cloners lock", MTX_DEF); VNET_DEFINE_STATIC(int, if_cloners_count); -VNET_DEFINE(LIST_HEAD(, if_clone), if_cloners); +VNET_DEFINE(LIST_HEAD(, if_clone), if_cloners) = LIST_HEAD_INITIALIZER(); #define V_if_cloners_count VNET(if_cloners_count) #define V_if_cloners VNET(if_cloners) @@ -183,13 +183,6 @@ VNET_DEFINE(LIST_HEAD(, if_clone), if_cloners); static MALLOC_DEFINE(M_CLONE, "clone", "interface cloning framework"); -void -vnet_if_clone_init(void) -{ - - LIST_INIT(&V_if_cloners); -} - /* * Lookup and create a clone network interface. */ diff --git a/sys/net/if_clone.h b/sys/net/if_clone.h index e11fc5c8cdd7..5a74ffa1cc2f 100644 --- a/sys/net/if_clone.h +++ b/sys/net/if_clone.h @@ -148,7 +148,6 @@ typedef void (*if_clone_event_handler_t)(void *, struct if_clone *); EVENTHANDLER_DECLARE(if_clone_event, if_clone_event_handler_t); /* The below interfaces used only by net/if.c. */ -void vnet_if_clone_init(void); int if_clone_create(char *, size_t, caddr_t); int if_clone_destroy(const char *); int if_clone_list(struct if_clonereq *);