4 files changed, 37 insertions, 48 deletions
diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c
index c06a285..0ac2af4 100644
--- a/sys/dev/ar/if_ar.c
+++ b/sys/dev/ar/if_ar.c
@@ -227,18 +227,15 @@ static ng_rcvdata_t	ngar_rcvdata;
 static ng_disconnect_t	ngar_disconnect;
 	
 static struct ng_type typestruct = {
-	NG_ABI_VERSION,
-	NG_AR_NODE_TYPE,
-	NULL,
-	ngar_constructor,
-	ngar_rcvmsg,
-	ngar_shutdown,
-	ngar_newhook,
-	NULL,
-	ngar_connect,
-	ngar_rcvdata,
-	ngar_disconnect,
-	NULL
+	.version =	NG_ABI_VERSION,
+	.name =		NG_AR_NODE_TYPE,
+	.constructor =	ngar_constructor,
+	.rcvmsg =	ngar_rcvmsg,
+	.shutdown =	ngar_shutdown,
+	.newhook =	ngar_newhook,
+	.connect =	ngar_connect,
+	.rcvdata =	ngar_rcvdata,
+	.disconnect =	ngar_disconnect,
 };
 
 static int	ngar_done_init = 0;
diff --git a/sys/dev/musycc/musycc.c b/sys/dev/musycc/musycc.c
index 1981349..88f2222 100644
--- a/sys/dev/musycc/musycc.c
+++ b/sys/dev/musycc/musycc.c
@@ -274,18 +274,15 @@ static  ng_rcvdata_t musycc_rcvdata;
 static  ng_disconnect_t musycc_disconnect;
 
 static struct ng_type ngtypestruct = {
-	NG_ABI_VERSION,
-	NG_NODETYPE,
-	NULL, 
-	musycc_constructor,
-	musycc_rcvmsg,
-	musycc_shutdown,
-	musycc_newhook,
-	NULL,
-	musycc_connect,
-	musycc_rcvdata,
-	musycc_disconnect,
-	NULL
+	.version =	NG_ABI_VERSION,
+	.name =		NG_NODETYPE,
+	.constructor =	musycc_constructor,
+	.rcvmsg =	musycc_rcvmsg,
+	.shutdown =	musycc_shutdown,
+	.newhook =	musycc_newhook,
+	.connect =	musycc_connect,
+	.rcvdata =	musycc_rcvdata,
+	.disconnect =	musycc_disconnect,
 };
 
 /*
diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c
index f187703..19e21b7 100644
--- a/sys/dev/sr/if_sr.c
+++ b/sys/dev/sr/if_sr.c
@@ -273,18 +273,15 @@ static ng_rcvdata_t	ngsr_rcvdata;
 static ng_disconnect_t	ngsr_disconnect;
 
 static struct ng_type typestruct = {
-	NG_ABI_VERSION,
-	NG_SR_NODE_TYPE,
-	NULL,
-	ngsr_constructor,
-	ngsr_rcvmsg,
-	ngsr_shutdown,
-	ngsr_newhook,
-	NULL,
-	ngsr_connect,
-	ngsr_rcvdata,
-	ngsr_disconnect,
-	NULL
+	.version =	NG_ABI_VERSION,
+	.name =		NG_SR_NODE_TYPE,
+	.constructor =	ngsr_constructor,
+	.rcvmsg =	ngsr_rcvmsg,
+	.shutdown =	ngsr_shutdown,
+	.newhook =	ngsr_newhook,
+	.connect =	ngsr_connect,
+	.rcvdata =	ngsr_rcvdata,
+	.disconnect =	ngsr_disconnect,
 };
 
 static int	ngsr_done_init = 0;
diff --git a/sys/dev/usb/udbp.c b/sys/dev/usb/udbp.c
index c021b31..533a799 100644
--- a/sys/dev/usb/udbp.c
+++ b/sys/dev/usb/udbp.c
@@ -196,18 +196,16 @@ Static const struct ng_cmdlist ng_udbp_cmdlist[] = {
 
 /* Netgraph node type descriptor */
 Static struct ng_type ng_udbp_typestruct = {
-	NG_ABI_VERSION,
-	NG_UDBP_NODE_TYPE,
-	NULL,
-	ng_udbp_constructor,
-	ng_udbp_rcvmsg,
-	ng_udbp_rmnode,
-	ng_udbp_newhook,
-	NULL,
-	ng_udbp_connect,
-	ng_udbp_rcvdata,
-	ng_udbp_disconnect,
-	ng_udbp_cmdlist
+	.version =	NG_ABI_VERSION,
+	.name =		NG_UDBP_NODE_TYPE,
+	.constructor =	ng_udbp_constructor,
+	.rcvmsg =	ng_udbp_rcvmsg,
+	.shutdown =	ng_udbp_rmnode,
+	.newhook =	ng_udbp_newhook,
+	.connect =	ng_udbp_connect,
+	.rcvdata =	ng_udbp_rcvdata,
+	.disconnect =	ng_udbp_disconnect,
+	.cmdlist =	ng_udbp_cmdlist,
 };
 
 Static int udbp_setup_in_transfer	(udbp_p sc);