D60009.id187652.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D60009.id187652.diff
View Options

	diff --git a/sys/dev/usb/net/usb_ethernet.c b/sys/dev/usb/net/usb_ethernet.c
	--- a/sys/dev/usb/net/usb_ethernet.c
	+++ b/sys/dev/usb/net/usb_ethernet.c
	@@ -262,7 +262,7 @@

	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
	--- a/sys/net80211/ieee80211_freebsd.c
	+++ b/sys/net80211/ieee80211_freebsd.c
	@@ -283,7 +283,7 @@
	}
	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
	--- a/sys/sys/sysctl.h
	+++ b/sys/sys/sysctl.h
	@@ -273,9 +273,6 @@

	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