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, 7 insertions, 9 deletions

diff --git a/sys/dev/pdq/if_fea.c b/sys/dev/pdq/if_fea.c
index 95200f7..2c1dc43 100644
--- a/sys/dev/pdq/if_fea.c
+++ b/sys/dev/pdq/if_fea.c
@@ -223,12 +223,11 @@ pdq_eisa_attach (dev)
 		goto bad;
 	}
 
-	ifp->if_name = "fea";
-	ifp->if_unit = device_get_unit(dev);
+	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
 
 	pdq_eisa_devinit(sc);
 	sc->sc_pdq = pdq_initialize(sc->mem_bst, sc->mem_bsh,
-				    ifp->if_name, ifp->if_unit,
+				    ifp->if_xname, -1,
 				    (void *)sc, PDQ_DEFEA);
 	if (sc->sc_pdq == NULL) {
 		device_printf(dev, "Initialization failed.\n");
diff --git a/sys/dev/pdq/if_fpa.c b/sys/dev/pdq/if_fpa.c
index 8aeccbf..997f0cc 100644
--- a/sys/dev/pdq/if_fpa.c
+++ b/sys/dev/pdq/if_fpa.c
@@ -149,11 +149,10 @@ pdq_pci_attach(device_t dev)
 	goto bad;
     }
 
-    ifp->if_name = "fpa";
-    ifp->if_unit = device_get_unit(dev);
+    if_initname(ifp, device_get_name(dev), device_get_unit(dev));
 
     sc->sc_pdq = pdq_initialize(sc->mem_bst, sc->mem_bsh,
-				ifp->if_name, ifp->if_unit,
+				ifp->if_xname, -1,
 				(void *)sc, PDQ_DEFPA);
     if (sc->sc_pdq == NULL) {
 	device_printf(dev, "Initialization failed.\n");
diff --git a/sys/dev/pdq/pdq_freebsd.h b/sys/dev/pdq/pdq_freebsd.h
index f43f3e3..c86b14b 100644
--- a/sys/dev/pdq/pdq_freebsd.h
+++ b/sys/dev/pdq/pdq_freebsd.h
@@ -158,8 +158,8 @@ typedef struct _pdq_os_ctx_t {
 
 #if defined(PDQ_HWSUPPORT)
 
-#define	PDQ_OS_PREFIX			"%s%d: "
-#define	PDQ_OS_PREFIX_ARGS		pdq->pdq_os_name, pdq->pdq_unit
+#define	PDQ_OS_PREFIX			"%s: "
+#define	PDQ_OS_PREFIX_ARGS		pdq->pdq_os_name
 
 #define	PDQ_OS_PTR_FMT	"%p"
 #define	PDQ_OS_CSR_FMT	"0x%x"
diff --git a/sys/dev/pdq/pdqvar.h b/sys/dev/pdq/pdqvar.h
index 09358d8..1ac3d85 100644
--- a/sys/dev/pdq/pdqvar.h
+++ b/sys/dev/pdq/pdqvar.h
@@ -73,7 +73,7 @@ enum _pdq_type_t {
 #include <vm/vm_kern.h>
 
 #define	PDQ_USE_MBUFS
-#if defined(__NetBSD__)
+#if defined(__NetBSD__) || defined(__FreeBSD__)
 #define	PDQ_OS_PREFIX			"%s: "
 #define	PDQ_OS_PREFIX_ARGS		pdq->pdq_os_name
 #else