Replace the if_name and if_unit members of struct ifnet with new members

if_xname, if_dname, and if_dunit. if_xname is the name of the interface
and if_dname/unit are the driver name and instance.

This change paves the way for interface renaming and enhanced pseudo
device creation and configuration symantics.

Approved By:	re (in principle)
Reviewed By:	njl, imp
Tested On:	i386, amd64, sparc64
Obtained From:	NetBSD (if_xname)

4 files changed, 9 insertions, 7 deletions

diff --git a/sys/dev/vx/if_vx.c b/sys/dev/vx/if_vx.c
index 7c6e8a9..5f17e22 100644
--- a/sys/dev/vx/if_vx.c
+++ b/sys/dev/vx/if_vx.c
@@ -72,6 +72,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus_pio.h>
 #include <machine/bus.h>
 
+#include <sys/bus.h>
+
 #include <net/bpf.h>
 
 #include <dev/vx/if_vxreg.h>
@@ -122,9 +124,10 @@ static void vxsetlink(struct vx_softc *);
 
 
 int
-vxattach(sc)
-    struct vx_softc *sc;
+vxattach(dev)
+    device_t dev;
 {
+    struct vx_softc *sc = device_get_softc(dev);
     struct ifnet *ifp = &sc->arpcom.ac_if;
     int i;
 
@@ -154,8 +157,7 @@ vxattach(sc)
 
     printf(" address %6D\n", sc->arpcom.ac_enaddr, ":");
 
-    ifp->if_unit = sc->unit;
-    ifp->if_name = "vx";
+    if_initname(ifp, device_get_name(dev), device_get_unit(dev));
     ifp->if_mtu = ETHERMTU;
     ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
     ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
diff --git a/sys/dev/vx/if_vx_eisa.c b/sys/dev/vx/if_vx_eisa.c
index 95e5554..4c8931d 100644
--- a/sys/dev/vx/if_vx_eisa.c
+++ b/sys/dev/vx/if_vx_eisa.c
@@ -155,7 +155,7 @@ vx_eisa_attach(device_t dev)
 
     /* Now the registers are availible through the lower ioport */
 
-    vxattach(sc);
+    vxattach(dev);
 
     if (bus_setup_intr(dev, irq, INTR_TYPE_NET, vxintr, sc, &ih)) {
 	goto bad;
diff --git a/sys/dev/vx/if_vx_pci.c b/sys/dev/vx/if_vx_pci.c
index 201b4ea..ff4f1fb 100644
--- a/sys/dev/vx/if_vx_pci.c
+++ b/sys/dev/vx/if_vx_pci.c
@@ -151,7 +151,7 @@ vx_pci_attach(
 	vxintr, sc, &sc->vx_intrhand))
 	goto bad;
 
-    if (vxattach(sc) == 0) {
+    if (vxattach(dev) == 0) {
 	goto bad;
     }
 
diff --git a/sys/dev/vx/if_vxvar.h b/sys/dev/vx/if_vxvar.h
index 712e9f5..e8a7a32 100644
--- a/sys/dev/vx/if_vxvar.h
+++ b/sys/dev/vx/if_vxvar.h
@@ -70,7 +70,7 @@ struct vx_softc {
 	bus_space_read_1(sc->bst, sc->bsh, reg)
 
 extern void vxfree(struct vx_softc *);
-extern int vxattach(struct vx_softc *);
+extern int vxattach(device_t);
 extern void vxstop(struct vx_softc *);
 extern void vxintr(void *);
 extern int vxbusyeeprom(struct vx_softc *);