The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=4672ad1f16092c146261b4de485ec5eb5e8d127b
commit 4672ad1f16092c146261b4de485ec5eb5e8d127b Author: Olivier Certner <[email protected]> AuthorDate: 2026-09-25 08:29:19 +0000 Commit: Olivier Certner <[email protected]> CommitDate: 2026-09-25 15:21:44 +0000 SYSCTL(9): Retire SYSCTL_NODE_CHILDREN() It does not provide value over the pre-existing SYSCTL_STATIC_CHILDREN() macro, which is widely used in the tree, whereas SYSCTL_NODE_CHILDREN() is not. Reviewed by: markj MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D60009 --- sys/dev/usb/net/usb_ethernet.c | 2 +- sys/net80211/ieee80211_freebsd.c | 2 +- sys/sys/sysctl.h | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/dev/usb/net/usb_ethernet.c b/sys/dev/usb/net/usb_ethernet.c index 692ea64128b9..16235aa4e278 100644 --- a/sys/dev/usb/net/usb_ethernet.c +++ b/sys/dev/usb/net/usb_ethernet.c @@ -262,7 +262,7 @@ ue_attach_post_task(struct usb_proc_msg *_task) snprintf(num, sizeof(num), "%u", ue->ue_unit); ue->ue_sysctl_oid = SYSCTL_ADD_NODE(&ue->ue_sysctl_ctx, - &SYSCTL_NODE_CHILDREN(_net, ue), + SYSCTL_STATIC_CHILDREN(_net_ue), OID_AUTO, num, CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, ""); SYSCTL_ADD_PROC(&ue->ue_sysctl_ctx, SYSCTL_CHILDREN(ue->ue_sysctl_oid), OID_AUTO, "%parent", diff --git a/sys/net80211/ieee80211_freebsd.c b/sys/net80211/ieee80211_freebsd.c index 095be79e7bfe..741ec4886d38 100644 --- a/sys/net80211/ieee80211_freebsd.c +++ b/sys/net80211/ieee80211_freebsd.c @@ -283,7 +283,7 @@ ieee80211_sysctl_vattach(struct ieee80211vap *vap) } sysctl_ctx_init(ctx); snprintf(num, sizeof(num), "%u", ifp->if_dunit); - oid = SYSCTL_ADD_NODE(ctx, &SYSCTL_NODE_CHILDREN(_net, wlan), + oid = SYSCTL_ADD_NODE(ctx, SYSCTL_STATIC_CHILDREN(_net_wlan), OID_AUTO, num, CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, ""); SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, "%parent", CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_NEEDGIANT, diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h index 273dd2a71d30..3ff813aa8337 100644 --- a/sys/sys/sysctl.h +++ b/sys/sys/sysctl.h @@ -273,9 +273,6 @@ struct sysctl_ctx_entry { TAILQ_HEAD(sysctl_ctx_list, sysctl_ctx_entry); -#define SYSCTL_NODE_CHILDREN(parent, name) \ - sysctl__##parent##_##name.oid_children - #ifndef NO_SYSCTL_DESCR #define __DESCR(d) d #else
