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)

1 files changed, 6 insertions, 4 deletions

diff --git a/sys/dev/vx/if_vx.c b/sys/dev/vx/if_vx.c
index 7c6e8a9df4da..5f17e2274f78 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;