3 files changed, 31 insertions, 36 deletions

diff --git a/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c b/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
index 35fd6a78dc7d7..fc1ead31d846b 100644
--- a/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
+++ b/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
@@ -227,18 +227,16 @@ static const struct ng_cmdlist	ng_bt3c_cmdlist[] = {
 };
 
 static struct ng_type	typestruct = {
-	NG_ABI_VERSION,
-	NG_BT3C_NODE_TYPE,	/* typename */
-	NULL,			/* modevent */
-	ng_bt3c_constructor,	/* constructor */
-	ng_bt3c_rcvmsg,		/* control message */
-	ng_bt3c_shutdown,	/* destructor */
-	ng_bt3c_newhook,	/* new hook */
-	NULL,			/* find hook */
-	ng_bt3c_connect,	/* connect hook */
-	ng_bt3c_rcvdata,	/* data */
-	ng_bt3c_disconnect,	/* disconnect hook */
-        ng_bt3c_cmdlist		/* node command list */
+	.version =	NG_ABI_VERSION,
+	.name = 	NG_BT3C_NODE_TYPE,
+	.constructor = 	ng_bt3c_constructor,
+	.rcvmsg =	ng_bt3c_rcvmsg,
+	.shutdown = 	ng_bt3c_shutdown,
+	.newhook =	ng_bt3c_newhook,
+	.connect =	ng_bt3c_connect,
+	.rcvdata =	ng_bt3c_rcvdata,
+	.disconnect =	ng_bt3c_disconnect,
+        .cmdlist =	ng_bt3c_cmdlist	
 };
 
 /*
diff --git a/sys/netgraph/bluetooth/drivers/h4/ng_h4.c b/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
index 41c713eb72fbe..3aeb21a585207 100644
--- a/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
+++ b/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
@@ -119,18 +119,17 @@ static int	ng_h4_mod_event		(module_t, int, void *);
 
 /* Netgraph node type descriptor */
 static struct ng_type		typestruct = {
-	NG_ABI_VERSION,
-	NG_H4_NODE_TYPE,	/* typename */
-	ng_h4_mod_event,	/* modevent */
-	ng_h4_constructor,	/* constructor */
-	ng_h4_rcvmsg,		/* control message */
-	ng_h4_shutdown,		/* destructor */
-	ng_h4_newhook,		/* new hook */
-	NULL,			/* find hook */
-	ng_h4_connect,		/* connect hook */
-	ng_h4_rcvdata,		/* data */
-	ng_h4_disconnect,	/* disconnect hook */
-	ng_h4_cmdlist		/* node command list */
+	.version =	NG_ABI_VERSION,
+	.name =		NG_H4_NODE_TYPE,
+	.mod_event =	ng_h4_mod_event,
+	.constructor =	ng_h4_constructor,
+	.rcvmsg =	ng_h4_rcvmsg,
+	.shutdown =	ng_h4_shutdown,
+	.newhook =	ng_h4_newhook,
+	.connect =	ng_h4_connect,
+	.rcvdata =	ng_h4_rcvdata,
+	.disconnect =	ng_h4_disconnect,
+	.cmdlist =	ng_h4_cmdlist
 };
 NETGRAPH_INIT(h4, &typestruct);
 MODULE_VERSION(ng_h4, NG_BLUETOOTH_VERSION);
diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
index 0f730d0985a65..ef893dae50290 100644
--- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
+++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
@@ -193,18 +193,16 @@ Static const struct ng_cmdlist	ng_ubt_cmdlist[] = {
 
 /* Netgraph node type */
 Static struct ng_type	typestruct = {
-	NG_ABI_VERSION,
-	NG_UBT_NODE_TYPE,	/* typename */
-	NULL,			/* modevent */
-	ng_ubt_constructor,	/* constructor */
-	ng_ubt_rcvmsg,		/* control message */
-	ng_ubt_shutdown,	/* destructor */
-	ng_ubt_newhook,		/* new hook */
-	NULL,			/* find hook */
-	ng_ubt_connect,		/* connect hook */
-	ng_ubt_rcvdata,		/* data */
-	ng_ubt_disconnect,	/* disconnect hook */
-	ng_ubt_cmdlist,		/* node command list */
+	.version =	NG_ABI_VERSION,
+	.name =		NG_UBT_NODE_TYPE,
+	.constructor =	ng_ubt_constructor,
+	.rcvmsg =	ng_ubt_rcvmsg,
+	.shutdown =	ng_ubt_shutdown,
+	.newhook =	ng_ubt_newhook,
+	.connect =	ng_ubt_connect,
+	.rcvdata =	ng_ubt_rcvdata,
+	.disconnect =	ng_ubt_disconnect,
+	.cmdlist =	ng_ubt_cmdlist	
 };
 
 /*