3 files changed, 4 insertions, 8 deletions
diff --git a/sys/dev/ntb/if_ntb/if_ntb.c b/sys/dev/ntb/if_ntb/if_ntb.c
index 5a132baa5f1c..2334265cefa7 100644
--- a/sys/dev/ntb/if_ntb/if_ntb.c
+++ b/sys/dev/ntb/if_ntb/if_ntb.c
@@ -136,10 +136,6 @@ ntb_net_attach(device_t dev)
 	int i;
 
 	ifp = sc->ifp = if_gethandle(IFT_ETHER);
-	if (ifp == NULL) {
-		printf("ntb: Cannot allocate ifnet structure\n");
-		return (ENOMEM);
-	}
 	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
 	if_setdev(ifp, dev);
 
diff --git a/sys/dev/ntb/ntb.c b/sys/dev/ntb/ntb.c
index 38def5be0bb1..53d9b47a9114 100644
--- a/sys/dev/ntb/ntb.c
+++ b/sys/dev/ntb/ntb.c
@@ -107,7 +107,7 @@ ntb_register_device(device_t dev)
 		nc->dbcnt = db;
 		nc->dbmask = (db == 0) ? 0 : (0xffffffffffffffff >> (64 - db));
 		rm_init(&nc->ctx_lock, "ntb ctx");
-		nc->dev = device_add_child(dev, name, -1);
+		nc->dev = device_add_child(dev, name, DEVICE_UNIT_ANY);
 		if (nc->dev == NULL) {
 			ntb_unregister_device(dev);
 			return (ENOMEM);
@@ -142,7 +142,7 @@ ntb_register_device(device_t dev)
 		i++;
 	}
 
-	bus_generic_attach(dev);
+	bus_attach_children(dev);
 	return (0);
 }
 
diff --git a/sys/dev/ntb/ntb_transport.c b/sys/dev/ntb/ntb_transport.c
index 6e2eefae88ec..6e085d8d276f 100644
--- a/sys/dev/ntb/ntb_transport.c
+++ b/sys/dev/ntb/ntb_transport.c
@@ -462,7 +462,7 @@ ntb_transport_attach(device_t dev)
 		nc->consumer = i;
 		nc->qpoff = qpu;
 		nc->qpcnt = qp;
-		nc->dev = device_add_child(dev, name, -1);
+		nc->dev = device_add_child(dev, name, DEVICE_UNIT_ANY);
 		if (nc->dev == NULL) {
 			device_printf(dev, "Can not add child.\n");
 			break;
@@ -511,7 +511,7 @@ ntb_transport_attach(device_t dev)
 	if (enable_xeon_watchdog != 0)
 		callout_reset(&nt->link_watchdog, 0, xeon_link_watchdog_hb, nt);
 
-	bus_generic_attach(dev);
+	bus_attach_children(dev);
 	return (0);
 
 err: