From cdb7d804fe1aa8f10775c2d15fa46d270b804080 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Tue, 6 Jan 2004 01:40:51 +0000
Subject: [PATCH] if_xname support Part 1/2: Convert most of the netif devices
 to use if_initname().

Submitted-by: Max Laier <max@love2party.net>
---
 share/man/man9/ifnet.9            | 38 ++++++++++++-----------
 sys/contrib/dev/oltr/if_oltr.c    |  8 ++---
 sys/dev/netif/an/if_an.c          |  5 ++--
 sys/dev/netif/ar/if_ar.c          | 13 ++++----
 sys/dev/netif/awi/if_awi_pccard.c | 12 ++++----
 sys/dev/netif/bge/if_bge.c        |  5 ++--
 sys/dev/netif/cx/if_cx.c          |  5 ++--
 sys/dev/netif/dc/if_dc.c          |  5 ++--
 sys/dev/netif/el/if_el.c          |  7 ++---
 sys/dev/netif/em/if_em.c          |  5 ++--
 sys/dev/netif/en_pci/if_en_pci.c  |  8 ++---
 sys/dev/netif/ep/if_ep.c          |  7 ++---
 sys/dev/netif/ex/if_ex.c          | 17 +++++------
 sys/dev/netif/fe/if_fe.c          | 11 ++++---
 sys/dev/netif/fwe/if_fwe.c        | 13 ++++----
 sys/dev/netif/fxp/if_fxp.c        |  5 ++--
 sys/dev/netif/gx/if_gx.c          |  5 ++--
 sys/dev/netif/lge/if_lge.c        |  5 ++--
 sys/dev/netif/my/if_my.c          |  5 ++--
 sys/dev/netif/nge/if_nge.c        |  5 ++--
 sys/dev/netif/pcn/if_pcn.c        |  5 ++--
 sys/dev/netif/ray/if_ray.c        |  5 ++--
 sys/dev/netif/rl/if_rl.c          |  5 ++--
 sys/dev/netif/sbni/if_sbni_isa.c  |  6 ++--
 sys/dev/netif/sbsh/if_sbsh.c      |  5 ++--
 sys/dev/netif/sf/if_sf.c          |  5 ++--
 sys/dev/netif/sis/if_sis.c        |  5 ++--
 sys/dev/netif/sk/if_sk.c          |  5 ++--
 sys/dev/netif/sn/if_sn.c          | 21 +++++++------
 sys/dev/netif/snc/dp83932.c       |  5 ++--
 sys/dev/netif/sr/if_sr.c          | 13 ++++----
 sys/dev/netif/ste/if_ste.c        |  5 ++--
 sys/dev/netif/tl/if_tl.c          |  7 ++---
 sys/dev/netif/tx/if_tx.c          |  5 ++--
 sys/dev/netif/txp/if_txp.c        |  5 ++--
 sys/dev/netif/vr/if_vr.c          |  5 ++--
 sys/dev/netif/vx/if_vx.c          |  9 +++---
 sys/dev/netif/wb/if_wb.c          |  5 ++--
 sys/dev/netif/wi/if_wi.c          |  5 ++--
 sys/dev/netif/wx/if_wx.c          |  5 ++--
 sys/dev/netif/xl/if_xl.c          |  5 ++--
 sys/net/faith/if_faith.c          |  5 ++--
 sys/net/gif/if_gif.c              |  5 ++--
 sys/net/gre/if_gre.c              |  5 ++--
 sys/net/stf/if_stf.c              |  5 ++--
 sys/net/tun/if_tun.c              | 50 +++++++++++++++----------------
 sys/net/vlan/if_vlan.c            | 13 ++++----
 47 files changed, 181 insertions(+), 222 deletions(-)

diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9
index f127eec027..1b871d5e5d 100644
--- a/share/man/man9/ifnet.9
+++ b/share/man/man9/ifnet.9
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man9/ifnet.9,v 1.9.2.10 2003/06/15 02:22:30 hmp Exp $
-.\" $DragonFly: src/share/man/man9/ifnet.9,v 1.2 2003/06/17 04:37:01 dillon Exp $
+.\" $DragonFly: src/share/man/man9/ifnet.9,v 1.3 2004/01/06 01:40:43 dillon Exp $
 .Dd January 15, 1997
 .Os
 .Dt IFNET 9
@@ -217,18 +217,30 @@ are as follows:
 .Pq Vt "void *"
 A pointer to the driver's private state block.
 (Initialized by driver.)
-.It Va if_name
-.Pq Vt "char *"
-The name of the interface, not including the unit number
-(e.g.,
-.Dq Li de
-or
-.Dq Li lo ) .
-(Initialized by driver.)
 .It Va if_link
 .Pq Fn TAILQ_ENTRY ifnet
 .Xr queue 3
 macro glue.
+.It Va if_xname
+.Pq Vt "char *"
+The name of the interface,
+(e.g.,
+.Dq Li fxp0
+or
+.Dq Li lo0) .
+(Initialized by driver.)
+.It Va if_dname
+.Pq Vt "const char *"
+The name of the driver.
+(Initialized by driver.)
+.It Va if_dunit
+.Pq Vt int
+A unique number assigned to each interface managed by a particular
+driver.
+Drivers may choose to set this to
+.Dv IF_DUNIT_NONE
+if a unit number is not associated with the device.
+(Initialized by driver.)
 .It Va if_addrhead
 .Pq Vt "struct ifaddrhead"
 The head of the
@@ -256,14 +268,6 @@ This number can be used in a
 to refer to a particular interface by index
 (see
 .Xr link_addr 3 ) .
-.It Va if_unit
-.Pq Vt short
-A unique number assigned to each interface managed by a particular
-driver, usually related to the unit number of a physical device in the
-kernel configuration file
-(see
-.Xr config 8 ) .
-(Initialized by driver.)
 .It Va if_timer
 .Pq Vt short
 Number of seconds until the watchdog timer
diff --git a/sys/contrib/dev/oltr/if_oltr.c b/sys/contrib/dev/oltr/if_oltr.c
index afae5842b4..93f6e566b1 100644
--- a/sys/contrib/dev/oltr/if_oltr.c
+++ b/sys/contrib/dev/oltr/if_oltr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/contrib/dev/oltr/if_oltr.c,v 1.11.2.5 2001/10/20 04:15:21 mdodd Exp $
- * $DragonFly: src/sys/contrib/dev/oltr/Attic/if_oltr.c,v 1.7 2003/08/27 11:02:14 rob Exp $
+ * $DragonFly: src/sys/contrib/dev/oltr/Attic/if_oltr.c,v 1.8 2004/01/06 01:40:45 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -382,8 +382,7 @@ oltr_pci_attach(device_t dev)
 	 * Do the ifnet initialization
 	 */
 	ifp->if_softc	= sc;
-	ifp->if_unit	= device_get_unit(dev);
-	ifp->if_name	= "oltr";
+	if_initname(ifp, "oltr", device_get_unit(dev));
 	ifp->if_output	= iso88025_output;
 	ifp->if_init	= oltr_init;
 	ifp->if_start	= oltr_start;
@@ -625,8 +624,7 @@ oltr_pci_attach(pcici_t config_id, int unit)
 	 * Do the ifnet initialization
 	 */
 	ifp->if_softc	= sc;
-	ifp->if_unit	= unit;
-	ifp->if_name	= "oltr";
+	if_initname(ifp, "oltr", unit);
 	ifp->if_output	= iso88025_output;
 	ifp->if_init	= oltr_init;
 	ifp->if_start	= oltr_start;
diff --git a/sys/dev/netif/an/if_an.c b/sys/dev/netif/an/if_an.c
index 34172ad0f9..de175d59f7 100644
--- a/sys/dev/netif/an/if_an.c
+++ b/sys/dev/netif/an/if_an.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/an/if_an.c,v 1.2.2.13 2003/02/11 03:32:48 ambrisko Exp $
- * $DragonFly: src/sys/dev/netif/an/if_an.c,v 1.8 2003/11/20 22:07:26 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/an/if_an.c,v 1.9 2004/01/06 01:40:46 dillon Exp $
  *
  * $FreeBSD: src/sys/dev/an/if_an.c,v 1.2.2.13 2003/02/11 03:32:48 ambrisko Exp $
  */
@@ -749,8 +749,7 @@ an_attach(sc, unit, flags)
 	    sc->arpcom.ac_enaddr, ":");
 
 	ifp->if_softc = sc;
-	ifp->if_unit = sc->an_unit = unit;
-	ifp->if_name = "an";
+	if_initname(ifp, "an", unit);
 	ifp->if_mtu = ETHERMTU;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_ioctl = an_ioctl;
diff --git a/sys/dev/netif/ar/if_ar.c b/sys/dev/netif/ar/if_ar.c
index a26d5de078..a7038c34b2 100644
--- a/sys/dev/netif/ar/if_ar.c
+++ b/sys/dev/netif/ar/if_ar.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ar/if_ar.c,v 1.52.2.1 2002/06/17 15:10:57 jhay Exp $
- * $DragonFly: src/sys/dev/netif/ar/if_ar.c,v 1.5 2003/11/20 22:07:26 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/ar/if_ar.c,v 1.6 2004/01/06 01:40:46 dillon Exp $
  */
 
 /*
@@ -295,8 +295,7 @@ ar_attach(device_t device)
 		ifp = &sc->ifsppp.pp_if;
 
 		ifp->if_softc = sc;
-		ifp->if_unit = sc->unit;
-		ifp->if_name = "ar";
+		if_initname(ifp, "ar", unit);
 		ifp->if_mtu = PP_MTU;
 		ifp->if_flags = IFF_POINTOPOINT | IFF_MULTICAST;
 		ifp->if_ioctl = arioctl;
@@ -774,20 +773,20 @@ arioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	int was_up, should_be_up;
 	struct ar_softc *sc = ifp->if_softc;
 
-	TRC(printf("ar%d: arioctl.\n", ifp->if_unit);)
+	TRC(printf("%s: arioctl.\n", ifp->if_xname);)
 
 	was_up = ifp->if_flags & IFF_RUNNING;
 
 	error = sppp_ioctl(ifp, cmd, data);
-	TRC(printf("ar%d: ioctl: ifsppp.pp_flags = %x, if_flags %x.\n", 
-		ifp->if_unit, ((struct sppp *)ifp)->pp_flags, ifp->if_flags);)
+	TRC(printf("%s: ioctl: ifsppp.pp_flags = %x, if_flags %x.\n", 
+		ifp->if_xname, ((struct sppp *)ifp)->pp_flags, ifp->if_flags);)
 	if(error)
 		return (error);
 
 	if((cmd != SIOCSIFFLAGS) && cmd != (SIOCSIFADDR))
 		return (0);
 
-	TRC(printf("ar%d: arioctl %s.\n", ifp->if_unit, 
+	TRC(printf("%s: arioctl %s.\n", ifp->if_xname, 
 		(cmd == SIOCSIFFLAGS) ? "SIOCSIFFLAGS" : "SIOCSIFADDR");)
 
 	s = splimp();
diff --git a/sys/dev/netif/awi/if_awi_pccard.c b/sys/dev/netif/awi/if_awi_pccard.c
index b4be376f14..b90a27a5aa 100644
--- a/sys/dev/netif/awi/if_awi_pccard.c
+++ b/sys/dev/netif/awi/if_awi_pccard.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/awi/if_awi_pccard.c,v 1.5.2.1 2000/12/07 04:09:39 imp Exp $
- * $DragonFly: src/sys/dev/netif/awi/Attic/if_awi_pccard.c,v 1.4 2003/11/20 22:07:26 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/awi/Attic/if_awi_pccard.c,v 1.5 2004/01/06 01:40:46 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -112,15 +112,15 @@ awi_pccard_attach(device_t dev)
 	psc->sc_mem_res = 0;
 	psc->sc_intrhand = 0;
 
-	ifp->if_name = device_get_name(dev);
-	ifp->if_unit = device_get_unit(dev);
-	if (ifp->if_name == NULL) {
+	ifp->if_dname = device_get_name(dev);
+	if (ifp->if_dname == NULL) {
 		printf("awi%d: awi_pccard_attach: cannot get device name\n",
 		    device_get_unit(dev));
 		goto fail;
 	}
-	snprintf(sc->sc_dev.dv_xname, sizeof(sc->sc_dev.dv_xname),
-	    "%s%d", ifp->if_name, ifp->if_unit);
+	if_initname(ifp, ifp->if_dname, device_get_unit(dev));
+	strlcpy(sc->sc_dev.dv_xname, ifp->if_xname,
+	    sizeof(sc->sc_dev.dv_xname));
 
 	psc->sc_port_rid = 0;
 	psc->sc_port_res = bus_alloc_resource(dev, SYS_RES_IOPORT,
diff --git a/sys/dev/netif/bge/if_bge.c b/sys/dev/netif/bge/if_bge.c
index ffa224cf1a..e2ddd479f4 100644
--- a/sys/dev/netif/bge/if_bge.c
+++ b/sys/dev/netif/bge/if_bge.c
@@ -31,7 +31,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/bge/if_bge.c,v 1.3.2.22 2003/05/11 18:00:55 ps Exp $
- * $DragonFly: src/sys/dev/netif/bge/if_bge.c,v 1.9 2003/11/20 22:07:26 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/bge/if_bge.c,v 1.10 2004/01/06 01:40:46 dillon Exp $
  *
  */
 
@@ -1733,8 +1733,7 @@ bge_attach(dev)
 	/* Set up ifnet structure */
 	ifp = &sc->arpcom.ac_if;
 	ifp->if_softc = sc;
-	ifp->if_unit = sc->bge_unit;
-	ifp->if_name = "bge";
+	if_initname(ifp, "bge", sc->bge_unit);
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_ioctl = bge_ioctl;
 	ifp->if_output = ether_output;
diff --git a/sys/dev/netif/cx/if_cx.c b/sys/dev/netif/cx/if_cx.c
index bbbf353e09..a8f1c2a08f 100644
--- a/sys/dev/netif/cx/if_cx.c
+++ b/sys/dev/netif/cx/if_cx.c
@@ -17,7 +17,7 @@
  * Version 1.9, Wed Oct  4 18:58:15 MSK 1995
  *
  * $FreeBSD: src/sys/i386/isa/if_cx.c,v 1.32 1999/11/18 08:36:42 peter Exp $
- * $DragonFly: src/sys/dev/netif/cx/if_cx.c,v 1.7 2003/11/20 22:07:26 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/cx/if_cx.c,v 1.8 2004/01/06 01:40:47 dillon Exp $
  *
  */
 #undef DEBUG
@@ -270,8 +270,7 @@ cxattach (struct isa_device *id)
 			bzero (c->ifp, IFSTRUCTSZ);
 			c->master = c->ifp;
 			c->ifp->if_softc = c;
-			c->ifp->if_unit = u;
-			c->ifp->if_name = "cx";
+			if_initname(c->ifp, "cx", u);
 			c->ifp->if_mtu = PP_MTU;
 			c->ifp->if_flags = IFF_POINTOPOINT | IFF_MULTICAST;
 			c->ifp->if_ioctl = cxsioctl;
diff --git a/sys/dev/netif/dc/if_dc.c b/sys/dev/netif/dc/if_dc.c
index 48f5757105..843a7f0758 100644
--- a/sys/dev/netif/dc/if_dc.c
+++ b/sys/dev/netif/dc/if_dc.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_dc.c,v 1.9.2.45 2003/06/08 14:31:53 mux Exp $
- * $DragonFly: src/sys/dev/netif/dc/if_dc.c,v 1.7 2003/11/20 22:07:27 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/dc/if_dc.c,v 1.8 2004/01/06 01:40:47 dillon Exp $
  *
  * $FreeBSD: src/sys/pci/if_dc.c,v 1.9.2.45 2003/06/08 14:31:53 mux Exp $
  */
@@ -2062,8 +2062,7 @@ static int dc_attach(dev)
 
 	ifp = &sc->arpcom.ac_if;
 	ifp->if_softc = sc;
-	ifp->if_unit = unit;
-	ifp->if_name = "dc";
+	if_initname(ifp, "dc", unit);
 	ifp->if_mtu = ETHERMTU;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_ioctl = dc_ioctl;
diff --git a/sys/dev/netif/el/if_el.c b/sys/dev/netif/el/if_el.c
index 890cb4f98a..4ac92b7b70 100644
--- a/sys/dev/netif/el/if_el.c
+++ b/sys/dev/netif/el/if_el.c
@@ -7,7 +7,7 @@
  * Questions, comments, bug reports and fixes to kimmel@cs.umass.edu.
  *
  * $FreeBSD: src/sys/i386/isa/if_el.c,v 1.47.2.2 2000/07/17 21:24:30 archie Exp $
- * $DragonFly: src/sys/dev/netif/el/if_el.c,v 1.5 2003/11/20 22:07:27 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/el/if_el.c,v 1.6 2004/01/06 01:40:47 dillon Exp $
  */
 /* Except of course for the portions of code lifted from other FreeBSD
  * drivers (mainly elread, elget and el_ioctl)
@@ -185,8 +185,7 @@ el_attach(struct isa_device *idev)
 
 	/* Initialize ifnet structure */
 	ifp->if_softc = sc;
-	ifp->if_unit = idev->id_unit;
-	ifp->if_name = "el";
+	if_initname(ifp, "el", idev->id_unit);
 	ifp->if_mtu = ETHERMTU;
 	ifp->if_output = ether_output;
 	ifp->if_start = el_start;
@@ -644,7 +643,7 @@ el_ioctl(ifp, command, data)
 static void
 el_watchdog(struct ifnet *ifp)
 {
-	log(LOG_ERR,"el%d: device timeout\n", ifp->if_unit);
+	log(LOG_ERR,"%s: device timeout\n", ifp->if_xname);
 	ifp->if_oerrors++;
 	el_reset(ifp->if_softc);
 }
diff --git a/sys/dev/netif/em/if_em.c b/sys/dev/netif/em/if_em.c
index 04391885d6..2d4db3d1e8 100644
--- a/sys/dev/netif/em/if_em.c
+++ b/sys/dev/netif/em/if_em.c
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
 ***************************************************************************/
 
 /*$FreeBSD: src/sys/dev/em/if_em.c,v 1.2.2.15 2003/06/09 22:10:15 pdeuskar Exp $*/
-/*$DragonFly: src/sys/dev/netif/em/if_em.c,v 1.4 2003/11/20 22:07:27 dillon Exp $*/
+/*$DragonFly: src/sys/dev/netif/em/if_em.c,v 1.5 2004/01/06 01:40:47 dillon Exp $*/
 
 #include "if_em.h"
 
@@ -1635,8 +1635,7 @@ em_setup_interface(device_t dev, struct adapter * adapter)
 	INIT_DEBUGOUT("em_setup_interface: begin");
 
 	ifp = &adapter->interface_data.ac_if;
-	ifp->if_unit = adapter->unit;
-	ifp->if_name = "em";
+	if_initname(ifp, "em", adapter->unit);
 	ifp->if_mtu = ETHERMTU;
 	ifp->if_output = ether_output;
 	ifp->if_baudrate = 1000000000;
diff --git a/sys/dev/netif/en_pci/if_en_pci.c b/sys/dev/netif/en_pci/if_en_pci.c
index c8e70b7749..a5121a473c 100644
--- a/sys/dev/netif/en_pci/if_en_pci.c
+++ b/sys/dev/netif/en_pci/if_en_pci.c
@@ -32,7 +32,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_en_pci.c,v 1.12 1999/08/21 22:10:49 msmith Exp $
- * $DragonFly: src/sys/dev/netif/en_pci/if_en_pci.c,v 1.5 2003/11/20 22:07:27 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/en_pci/if_en_pci.c,v 1.6 2004/01/06 01:40:47 dillon Exp $
  */
 
 /*
@@ -251,9 +251,9 @@ int unit;
   enpcis[unit] = scp;			/* lock it in */
   en_cd.cd_devs[unit] = sc;		/* fake a cfdriver structure */
   en_cd.cd_ndevs = NEN;
-  snprintf(sc->sc_dev.dv_xname, sizeof(sc->sc_dev.dv_xname), "en%d", unit);
-  sc->enif.if_unit = unit;
-  sc->enif.if_name = "en";
+  if_initname(&(sc->enif), "en", unit);
+  snprintf(sc->sc_dev.dv_xname, sc->enif.if_xname,
+      sizeof(sc->sc_dev.dv_xname));
   scp->en_confid = config_id;
 
   /*
diff --git a/sys/dev/netif/ep/if_ep.c b/sys/dev/netif/ep/if_ep.c
index 97855c2aad..f3c2f6ed39 100644
--- a/sys/dev/netif/ep/if_ep.c
+++ b/sys/dev/netif/ep/if_ep.c
@@ -39,7 +39,7 @@
 
 /*
  * $FreeBSD: src/sys/dev/ep/if_ep.c,v 1.95.2.3 2002/03/06 07:26:35 imp Exp $
- * $DragonFly: src/sys/dev/netif/ep/if_ep.c,v 1.6 2003/11/20 22:07:27 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/ep/if_ep.c,v 1.7 2004/01/06 01:40:47 dillon Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -291,8 +291,7 @@ ep_attach(sc)
 	attached = (ifp->if_softc != 0);
 
 	ifp->if_softc = sc;
-	ifp->if_unit = sc->unit;
-	ifp->if_name = "ep";
+	if_initname(ifp, "ep", sc->unit);
 	ifp->if_mtu = ETHERMTU;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_output = ether_output;
@@ -926,7 +925,7 @@ ep_if_watchdog(ifp)
     /*
     printf("ep: watchdog\n");
 
-    log(LOG_ERR, "ep%d: watchdog\n", ifp->if_unit);
+    log(LOG_ERR, "%s: watchdog\n", ifp->if_xname);
     ifp->if_oerrors++;
     */
 
diff --git a/sys/dev/netif/ex/if_ex.c b/sys/dev/netif/ex/if_ex.c
index d0551c8d3e..0978c8a2df 100644
--- a/sys/dev/netif/ex/if_ex.c
+++ b/sys/dev/netif/ex/if_ex.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ex/if_ex.c,v 1.26.2.3 2001/03/05 05:33:20 imp Exp $
- * $DragonFly: src/sys/dev/netif/ex/if_ex.c,v 1.6 2003/11/20 22:07:28 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/ex/if_ex.c,v 1.7 2004/01/06 01:40:47 dillon Exp $
  *
  * MAINTAINER: Matthew N. Dodd <winter@jurai.net>
  *                             <mdodd@FreeBSD.org>
@@ -236,8 +236,7 @@ ex_attach(device_t dev)
 	 * Initialize the ifnet structure.
 	 */
 	ifp->if_softc = sc;
-	ifp->if_unit = unit;
-	ifp->if_name = "ex";
+	if_initname(ifp, "ex", unit);
 	ifp->if_mtu = ETHERMTU;
 	ifp->if_flags = IFF_SIMPLEX | IFF_BROADCAST /* XXX not done yet. | IFF_MULTICAST */;
 	ifp->if_output = ether_output;
@@ -284,7 +283,7 @@ ex_init(void *xsc)
 	register int		iobase = sc->iobase;
 	unsigned short		temp_reg;
 
-	DODEBUG(Start_End, printf("ex_init%d: start\n", ifp->if_unit););
+	DODEBUG(Start_End, printf("ex_init%d: start\n", ifp->if_dunit););
 
 	if (TAILQ_FIRST(&ifp->if_addrhead) == NULL) {
 		return;
@@ -363,7 +362,7 @@ ex_init(void *xsc)
 	ex_start(ifp);
 	splx(s);
 
-	DODEBUG(Start_End, printf("ex_init%d: finish\n", ifp->if_unit););
+	DODEBUG(Start_End, printf("ex_init%d: finish\n", ifp->if_dunit););
 }
 
 
@@ -786,7 +785,7 @@ ex_ioctl(register struct ifnet *ifp, u_long cmd, caddr_t data)
 	int			s;
 	int			error = 0;
 
-	DODEBUG(Start_End, printf("ex_ioctl%d: start ", ifp->if_unit););
+	DODEBUG(Start_End, printf("ex_ioctl%d: start ", ifp->if_dunit););
 
 	s = splimp();
 
@@ -833,7 +832,7 @@ ex_ioctl(register struct ifnet *ifp, u_long cmd, caddr_t data)
 
 	splx(s);
 
-	DODEBUG(Start_End, printf("\nex_ioctl%d: finish\n", ifp->if_unit););
+	DODEBUG(Start_End, printf("\nex_ioctl%d: finish\n", ifp->if_dunit););
 
 	return(error);
 }
@@ -863,7 +862,7 @@ ex_watchdog(struct ifnet *ifp)
 {
 	struct ex_softc *	sc = ifp->if_softc;
 
-	DODEBUG(Start_End, printf("ex_watchdog%d: start\n", ifp->if_unit););
+	DODEBUG(Start_End, printf("ex_watchdog%d: start\n", ifp->if_dunit););
 
 	ifp->if_flags &= ~IFF_OACTIVE;
 
@@ -873,7 +872,7 @@ ex_watchdog(struct ifnet *ifp)
 	ex_reset(sc);
 	ex_start(ifp);
 
-	DODEBUG(Start_End, printf("ex_watchdog%d: finish\n", ifp->if_unit););
+	DODEBUG(Start_End, printf("ex_watchdog%d: finish\n", ifp->if_dunit););
 
 	return;
 }
diff --git a/sys/dev/netif/fe/if_fe.c b/sys/dev/netif/fe/if_fe.c
index 85fd909de2..73890df2dc 100644
--- a/sys/dev/netif/fe/if_fe.c
+++ b/sys/dev/netif/fe/if_fe.c
@@ -22,7 +22,7 @@
 
 /*
  * $FreeBSD: src/sys/dev/fe/if_fe.c,v 1.65.2.1 2000/09/22 10:01:47 nyan Exp $
- * $DragonFly: src/sys/dev/netif/fe/if_fe.c,v 1.5 2003/11/20 22:07:28 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/fe/if_fe.c,v 1.6 2004/01/06 01:40:47 dillon Exp $
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * Contributed by M. Sekiguchi. <seki@sysrap.cs.fujitsu.co.jp>
@@ -753,8 +753,7 @@ fe_attach (device_t dev)
 	 * Initialize ifnet structure
 	 */
  	sc->sc_if.if_softc    = sc;
-	sc->sc_if.if_unit     = sc->sc_unit;
-	sc->sc_if.if_name     = "fe";
+ 	if_initname(&(sc->sc_if), "fe", sc->sc_unit);
 	sc->sc_if.if_output   = ether_output;
 	sc->sc_if.if_start    = fe_start;
 	sc->sc_if.if_ioctl    = fe_ioctl;
@@ -1007,11 +1006,11 @@ fe_watchdog ( struct ifnet *ifp )
 	struct fe_softc *sc = (struct fe_softc *)ifp;
 
 	/* A "debug" message.  */
-	printf("fe%d: transmission timeout (%d+%d)%s\n",
-	       ifp->if_unit, sc->txb_sched, sc->txb_count,
+	printf("%s: transmission timeout (%d+%d)%s\n",
+	       ifp->if_xname, sc->txb_sched, sc->txb_count,
 	       (ifp->if_flags & IFF_UP) ? "" : " when down");
 	if (sc->sc_if.if_opackets == 0 && sc->sc_if.if_ipackets == 0)
-		printf("fe%d: wrong IRQ setting in config?\n", ifp->if_unit);
+		printf("%s: wrong IRQ setting in config?\n", ifp->if_xname);
 	fe_reset(sc);
 }
 
diff --git a/sys/dev/netif/fwe/if_fwe.c b/sys/dev/netif/fwe/if_fwe.c
index c289e0f163..556924e31f 100644
--- a/sys/dev/netif/fwe/if_fwe.c
+++ b/sys/dev/netif/fwe/if_fwe.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  * 
  * $FreeBSD: src/sys/dev/firewire/if_fwe.c,v 1.1.2.11 2003/04/28 03:29:18 simokawa Exp $
- * $DragonFly: src/sys/dev/netif/fwe/if_fwe.c,v 1.5 2003/11/20 22:07:28 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/fwe/if_fwe.c,v 1.6 2004/01/06 01:40:47 dillon Exp $
  */
 
 #include "opt_inet.h"
@@ -188,8 +188,7 @@ fwe_attach(device_t dev)
 	ifp = &fwe->fwe_if;
 	ifp->if_softc = &fwe->eth_softc;
 
-	ifp->if_unit = unit;
-	ifp->if_name = "fwe";
+	if_initname(ifp, "fwe", unit);
 	ifp->if_init = fwe_init;
 	ifp->if_output = ether_output;
 	ifp->if_start = fwe_start;
@@ -213,7 +212,7 @@ fwe_attach(device_t dev)
 #endif
 
 
-	FWEDEBUG("interface %s%d created.\n", ifp->if_name, ifp->if_unit);
+	FWEDEBUG("interface %s created.\n", ifp->if_xname);
 	return 0;
 }
 
@@ -289,7 +288,7 @@ fwe_init(void *arg)
 	struct mbuf *m;
 	int i;
 
-	FWEDEBUG("initializing %s%d\n", ifp->if_name, ifp->if_unit);
+	FWEDEBUG("initializing %s\n", ifp->if_xname);
 
 	/* XXX keep promiscoud mode */
 	ifp->if_flags |= IFF_PROMISC;
@@ -470,12 +469,12 @@ fwe_start(struct ifnet *ifp)
 	struct fwe_softc *fwe = ((struct fwe_eth_softc *)ifp->if_softc)->fwe;
 	int s;
 
-	FWEDEBUG("%s%d starting\n", ifp->if_name, ifp->if_unit);
+	FWEDEBUG("%s starting\n", ifp->if_xname);
 
 	if (fwe->dma_ch < 0) {
 		struct mbuf	*m = NULL;
 
-		FWEDEBUG("%s%d not ready.\n", ifp->if_name, ifp->if_unit);
+		FWEDEBUG("%s not ready.\n", ifp->if_xname);
 
 		s = splimp();
 		do {
diff --git a/sys/dev/netif/fxp/if_fxp.c b/sys/dev/netif/fxp/if_fxp.c
index 37d15c477e..1077913bf4 100644
--- a/sys/dev/netif/fxp/if_fxp.c
+++ b/sys/dev/netif/fxp/if_fxp.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.110.2.30 2003/06/12 16:47:05 mux Exp $
- * $DragonFly: src/sys/dev/netif/fxp/if_fxp.c,v 1.5 2003/12/16 18:32:58 hmp Exp $
+ * $DragonFly: src/sys/dev/netif/fxp/if_fxp.c,v 1.6 2004/01/06 01:40:47 dillon Exp $
  */
 
 /*
@@ -656,8 +656,7 @@ fxp_attach(device_t dev)
 	}
 
 	ifp = &sc->arpcom.ac_if;
-	ifp->if_unit = device_get_unit(dev);
-	ifp->if_name = "fxp";
+	if_initname(ifp, "fxp", device_get_unit(dev));
 	ifp->if_output = ether_output;
 	ifp->if_baudrate = 100000000;
 	ifp->if_init = fxp_init;
diff --git a/sys/dev/netif/gx/if_gx.c b/sys/dev/netif/gx/if_gx.c
index 3fc22d3ca1..e3b5fa4e54 100644
--- a/sys/dev/netif/gx/if_gx.c
+++ b/sys/dev/netif/gx/if_gx.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/gx/if_gx.c,v 1.2.2.3 2001/12/14 19:51:39 jlemon Exp $
- * $DragonFly: src/sys/dev/netif/gx/Attic/if_gx.c,v 1.4 2003/11/20 22:07:28 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/gx/Attic/if_gx.c,v 1.5 2004/01/06 01:40:48 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -339,8 +339,7 @@ gx_attach(device_t dev)
 	/* Set up ifnet structure */
 	ifp = &gx->arpcom.ac_if;
 	ifp->if_softc = gx;
-	ifp->if_unit = device_get_unit(dev);
-	ifp->if_name = "gx";
+	if_initname(ifp, "gx", device_get_unit(dev));
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_ioctl = gx_ioctl;
 	ifp->if_output = ether_output;
diff --git a/sys/dev/netif/lge/if_lge.c b/sys/dev/netif/lge/if_lge.c
index 01e0c8428b..56caa88988 100644
--- a/sys/dev/netif/lge/if_lge.c
+++ b/sys/dev/netif/lge/if_lge.c
@@ -31,7 +31,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/lge/if_lge.c,v 1.5.2.2 2001/12/14 19:49:23 jlemon Exp $
- * $DragonFly: src/sys/dev/netif/lge/if_lge.c,v 1.6 2003/11/20 22:07:29 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/lge/if_lge.c,v 1.7 2004/01/06 01:40:48 dillon Exp $
  *
  * $FreeBSD: src/sys/dev/lge/if_lge.c,v 1.5.2.2 2001/12/14 19:49:23 jlemon Exp $
  */
@@ -636,8 +636,7 @@ static int lge_attach(dev)
 
 	ifp = &sc->arpcom.ac_if;
 	ifp->if_softc = sc;
-	ifp->if_unit = unit;
-	ifp->if_name = "lge";
+	if_initname(ifp, "lge", unit);
 	ifp->if_mtu = ETHERMTU;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_ioctl = lge_ioctl;
diff --git a/sys/dev/netif/my/if_my.c b/sys/dev/netif/my/if_my.c
index 3bbde1edaf..b09bc30b4b 100644
--- a/sys/dev/netif/my/if_my.c
+++ b/sys/dev/netif/my/if_my.c
@@ -26,7 +26,7 @@
  * Written by: yen_cw@myson.com.tw  available at: http://www.myson.com.tw/
  *
  * $FreeBSD: src/sys/dev/my/if_my.c,v 1.2.2.4 2002/04/17 02:05:27 julian Exp $
- * $DragonFly: src/sys/dev/netif/my/if_my.c,v 1.5 2003/11/20 22:07:29 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/my/if_my.c,v 1.6 2004/01/06 01:40:48 dillon Exp $
  *
  * Myson fast ethernet PCI NIC driver
  *
@@ -987,8 +987,7 @@ my_attach(device_t dev)
 
 	ifp = &sc->arpcom.ac_if;
 	ifp->if_softc = sc;
-	ifp->if_unit = unit;
-	ifp->if_name = "my";
+	if_initname(ifp, "my", unit);
 	ifp->if_mtu = ETHERMTU;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_ioctl = my_ioctl;
diff --git a/sys/dev/netif/nge/if_nge.c b/sys/dev/netif/nge/if_nge.c
index 5c32cc4028..b2d405c6d1 100644
--- a/sys/dev/netif/nge/if_nge.c
+++ b/sys/dev/netif/nge/if_nge.c
@@ -31,7 +31,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/nge/if_nge.c,v 1.13.2.13 2003/02/05 22:03:57 mbr Exp $
- * $DragonFly: src/sys/dev/netif/nge/if_nge.c,v 1.5 2003/11/20 22:07:29 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/nge/if_nge.c,v 1.6 2004/01/06 01:40:48 dillon Exp $
  *
  * $FreeBSD: src/sys/dev/nge/if_nge.c,v 1.13.2.13 2003/02/05 22:03:57 mbr Exp $
  */
@@ -954,8 +954,7 @@ static int nge_attach(dev)
 
 	ifp = &sc->arpcom.ac_if;
 	ifp->if_softc = sc;
-	ifp->if_unit = unit;
-	ifp->if_name = "nge";
+	if_initname(ifp, "nge", unit);
 	ifp->if_mtu = ETHERMTU;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_ioctl = nge_ioctl;
diff --git a/sys/dev/netif/pcn/if_pcn.c b/sys/dev/netif/pcn/if_pcn.c
index c058b1db44..e1847bea80 100644
--- a/sys/dev/netif/pcn/if_pcn.c
+++ b/sys/dev/netif/pcn/if_pcn.c
@@ -31,7 +31,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_pcn.c,v 1.5.2.10 2003/03/05 18:42:33 njl Exp $
- * $DragonFly: src/sys/dev/netif/pcn/if_pcn.c,v 1.6 2003/11/20 22:07:30 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/pcn/if_pcn.c,v 1.7 2004/01/06 01:40:48 dillon Exp $
  *
  * $FreeBSD: src/sys/pci/if_pcn.c,v 1.5.2.10 2003/03/05 18:42:33 njl Exp $
  */
@@ -620,8 +620,7 @@ static int pcn_attach(dev)
 
 	ifp = &sc->arpcom.ac_if;
 	ifp->if_softc = sc;
-	ifp->if_unit = unit;
-	ifp->if_name = "pcn";
+	if_initname(ifp, "pcn", unit);
 	ifp->if_mtu = ETHERMTU;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_ioctl = pcn_ioctl;
diff --git a/sys/dev/netif/ray/if_ray.c b/sys/dev/netif/ray/if_ray.c
index fd2e0ebcee..a49e8761c1 100644
--- a/sys/dev/netif/ray/if_ray.c
+++ b/sys/dev/netif/ray/if_ray.c
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ray/if_ray.c,v 1.47.2.4 2001/08/14 22:54:05 dmlb Exp $
- * $DragonFly: src/sys/dev/netif/ray/Attic/if_ray.c,v 1.7 2003/11/20 22:07:30 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/ray/Attic/if_ray.c,v 1.8 2004/01/06 01:40:48 dillon Exp $
  *
  */
 
@@ -505,9 +505,8 @@ ray_attach(device_t dev)
 	 */
 	bcopy((char *)&ep->e_station_addr,
 	    (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN);
+	if_initname(ifp, "ray", device_get_unit(dev));
 	ifp->if_softc = sc;
-	ifp->if_name = "ray";
-	ifp->if_unit = device_get_unit(dev);
 	ifp->if_timer = 0;
 	ifp->if_flags = (IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST);
 	ifp->if_hdrlen = sizeof(struct ieee80211_frame) + 
diff --git a/sys/dev/netif/rl/if_rl.c b/sys/dev/netif/rl/if_rl.c
index 3407c7078c..f0b6001dab 100644
--- a/sys/dev/netif/rl/if_rl.c
+++ b/sys/dev/netif/rl/if_rl.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_rl.c,v 1.38.2.16 2003/03/05 18:42:33 njl Exp $
- * $DragonFly: src/sys/dev/netif/rl/if_rl.c,v 1.6 2003/11/20 22:07:30 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/rl/if_rl.c,v 1.7 2004/01/06 01:40:48 dillon Exp $
  *
  * $FreeBSD: src/sys/pci/if_rl.c,v 1.38.2.16 2003/03/05 18:42:33 njl Exp $
  */
@@ -963,8 +963,7 @@ static int rl_attach(dev)
 
 	ifp = &sc->arpcom.ac_if;
 	ifp->if_softc = sc;
-	ifp->if_unit = unit;
-	ifp->if_name = "rl";
+	if_initname(ifp, "rl", unit);
 	ifp->if_mtu = ETHERMTU;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_ioctl = rl_ioctl;
diff --git a/sys/dev/netif/sbni/if_sbni_isa.c b/sys/dev/netif/sbni/if_sbni_isa.c
index ea1dcddd83..861242138a 100644
--- a/sys/dev/netif/sbni/if_sbni_isa.c
+++ b/sys/dev/netif/sbni/if_sbni_isa.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/sbni/if_sbni_isa.c,v 1.1.2.5 2002/08/11 09:32:00 fjoe Exp $
- * $DragonFly: src/sys/dev/netif/sbni/Attic/if_sbni_isa.c,v 1.3 2003/08/07 21:17:04 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/sbni/Attic/if_sbni_isa.c,v 1.4 2004/01/06 01:40:48 dillon Exp $
  */
 
 
@@ -156,8 +156,8 @@ sbni_attach_isa(device_t dev)
 			    dev, SYS_RES_IOPORT, sc->io_rid, sc->io_res);
 			return (ENXIO);
 		} else {
-			printf(" shared irq with sbni%d\n",
-			       master->arpcom.ac_if.if_unit);
+			printf(" shared irq with %s\n",
+			       master->arpcom.ac_if.if_xname);
 		}
 	} 
 #endif	/* SBNI_DUAL_COMPOUND */
diff --git a/sys/dev/netif/sbsh/if_sbsh.c b/sys/dev/netif/sbsh/if_sbsh.c
index ccc5b5c80b..ebe6181201 100644
--- a/sys/dev/netif/sbsh/if_sbsh.c
+++ b/sys/dev/netif/sbsh/if_sbsh.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/sbsh/if_sbsh.c,v 1.3.2.1 2003/04/15 18:15:07 fjoe Exp $
- * $DragonFly: src/sys/dev/netif/sbsh/if_sbsh.c,v 1.7 2003/11/20 22:07:30 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/sbsh/if_sbsh.c,v 1.8 2004/01/06 01:40:48 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -268,8 +268,7 @@ sbsh_attach(device_t dev)
 
 	ifp = &sc->arpcom.ac_if;
 	ifp->if_softc = sc;
-	ifp->if_unit = unit;
-	ifp->if_name = "sbsh";
+	if_initname(ifp, "sbsh", unit);
 	ifp->if_mtu = ETHERMTU;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_ioctl = sbsh_ioctl;
diff --git a/sys/dev/netif/sf/if_sf.c b/sys/dev/netif/sf/if_sf.c
index 2fec93c8b6..0a3bb53e6b 100644
--- a/sys/dev/netif/sf/if_sf.c
+++ b/sys/dev/netif/sf/if_sf.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_sf.c,v 1.18.2.8 2001/12/16 15:46:07 luigi Exp $
- * $DragonFly: src/sys/dev/netif/sf/if_sf.c,v 1.5 2003/11/20 22:07:30 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/sf/if_sf.c,v 1.6 2004/01/06 01:40:49 dillon Exp $
  *
  * $FreeBSD: src/sys/pci/if_sf.c,v 1.18.2.8 2001/12/16 15:46:07 luigi Exp $
  */
@@ -814,8 +814,7 @@ static int sf_attach(dev)
 
 	ifp = &sc->arpcom.ac_if;
 	ifp->if_softc = sc;
-	ifp->if_unit = unit;
-	ifp->if_name = "sf";
+	if_initname(ifp, "sf", unit);
 	ifp->if_mtu = ETHERMTU;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_ioctl = sf_ioctl;
diff --git a/sys/dev/netif/sis/if_sis.c b/sys/dev/netif/sis/if_sis.c
index 84196b7694..e24e798d89 100644
--- a/sys/dev/netif/sis/if_sis.c
+++ b/sys/dev/netif/sis/if_sis.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_sis.c,v 1.13.4.24 2003/03/05 18:42:33 njl Exp $
- * $DragonFly: src/sys/dev/netif/sis/if_sis.c,v 1.6 2003/11/20 22:07:30 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/sis/if_sis.c,v 1.7 2004/01/06 01:40:49 dillon Exp $
  *
  * $FreeBSD: src/sys/pci/if_sis.c,v 1.13.4.24 2003/03/05 18:42:33 njl Exp $
  */
@@ -1216,8 +1216,7 @@ static int sis_attach(dev)
 
 	ifp = &sc->arpcom.ac_if;
 	ifp->if_softc = sc;
-	ifp->if_unit = unit;
-	ifp->if_name = "sis";
+	if_initname(ifp, "sis", unit);
 	ifp->if_mtu = ETHERMTU;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_ioctl = sis_ioctl;
diff --git a/sys/dev/netif/sk/if_sk.c b/sys/dev/netif/sk/if_sk.c
index f195a9ef60..713035d9b7 100644
--- a/sys/dev/netif/sk/if_sk.c
+++ b/sys/dev/netif/sk/if_sk.c
@@ -32,7 +32,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_sk.c,v 1.19.2.9 2003/03/05 18:42:34 njl Exp $
- * $DragonFly: src/sys/dev/netif/sk/if_sk.c,v 1.10 2003/12/17 22:18:24 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/sk/if_sk.c,v 1.11 2004/01/06 01:40:49 dillon Exp $
  *
  * $FreeBSD: src/sys/pci/if_sk.c,v 1.19.2.9 2003/03/05 18:42:34 njl Exp $
  */
@@ -1484,8 +1484,7 @@ static int sk_attach(dev)
 
 	ifp = &sc_if->arpcom.ac_if;
 	ifp->if_softc = sc_if;
-	ifp->if_unit = sc_if->sk_unit; 
-	ifp->if_name = "sk";
+	if_initname(ifp, "sk", sc_if->sk_unit);
 	ifp->if_mtu = ETHERMTU;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_ioctl = sk_ioctl;
diff --git a/sys/dev/netif/sn/if_sn.c b/sys/dev/netif/sn/if_sn.c
index cc1183207b..b973059095 100644
--- a/sys/dev/netif/sn/if_sn.c
+++ b/sys/dev/netif/sn/if_sn.c
@@ -29,7 +29,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *   $FreeBSD: src/sys/dev/sn/if_sn.c,v 1.7.2.3 2001/02/04 04:38:38 toshi Exp $
- *   $DragonFly: src/sys/dev/netif/sn/if_sn.c,v 1.5 2003/11/20 22:07:31 dillon Exp $
+ *   $DragonFly: src/sys/dev/netif/sn/if_sn.c,v 1.6 2004/01/06 01:40:49 dillon Exp $
  */
 
 /*
@@ -216,8 +216,7 @@ sn_attach(device_t dev)
 	}
 	printf(" MAC address %6D\n", sc->arpcom.ac_enaddr, ":");
 	ifp->if_softc = sc;
-	ifp->if_unit = device_get_unit(dev);
-	ifp->if_name = "sn";
+	if_initname(ifp, "sn", device_get_unit(dev));
 	ifp->if_mtu = ETHERMTU;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_output = ether_output;
@@ -376,8 +375,8 @@ snstart(struct ifnet *ifp)
 	}
 	if (sc->pages_wanted != -1) {
 		splx(s);
-		printf("sn%d: snstart() while memory allocation pending\n",
-		       ifp->if_unit);
+		printf("%s: snstart() while memory allocation pending\n",
+		       ifp->if_xname);
 		return;
 	}
 startagain:
@@ -404,7 +403,7 @@ startagain:
 	 * them instead?
 	 */
 	if (len + pad > ETHER_MAX_LEN - ETHER_CRC_LEN) {
-		printf("sn%d: large packet discarded (A)\n", ifp->if_unit);
+		printf("%s: large packet discarded (A)\n", ifp->if_xname);
 		++sc->arpcom.ac_if.if_oerrors;
 		IF_DEQUEUE(&sc->arpcom.ac_if.if_snd, m);
 		m_freem(m);
@@ -475,7 +474,7 @@ startagain:
 	 */
 	packet_no = inb(BASE + ALLOC_RESULT_REG_B);
 	if (packet_no & ARR_FAILED) {
-		printf("sn%d: Memory allocation failed\n", ifp->if_unit);
+		printf("%s: Memory allocation failed\n", ifp->if_xname);
 		goto startagain;
 	}
 	/*
@@ -606,7 +605,7 @@ snresume(struct ifnet *ifp)
 	 */
 	m = sc->arpcom.ac_if.if_snd.ifq_head;
 	if (m == 0) {
-		printf("sn%d: snresume() with nothing to send\n", ifp->if_unit);
+		printf("%s: snresume() with nothing to send\n", ifp->if_xname);
 		return;
 	}
 	/*
@@ -623,7 +622,7 @@ snresume(struct ifnet *ifp)
 	 * them instead?
 	 */
 	if (len + pad > ETHER_MAX_LEN - ETHER_CRC_LEN) {
-		printf("sn%d: large packet discarded (B)\n", ifp->if_unit);
+		printf("%s: large packet discarded (B)\n", ifp->if_xname);
 		++sc->arpcom.ac_if.if_oerrors;
 		IF_DEQUEUE(&sc->arpcom.ac_if.if_snd, m);
 		m_freem(m);
@@ -659,7 +658,7 @@ snresume(struct ifnet *ifp)
 	 */
 	packet_no = inb(BASE + ALLOC_RESULT_REG_B);
 	if (packet_no & ARR_FAILED) {
-		printf("sn%d: Memory allocation failed.  Weird.\n", ifp->if_unit);
+		printf("%s: Memory allocation failed.  Weird.\n", ifp->if_xname);
 		sc->arpcom.ac_if.if_timer = 1;
 		goto try_start;
 	}
@@ -673,7 +672,7 @@ snresume(struct ifnet *ifp)
 	 * memory allocation was initiated.
 	 */
 	if (pages_wanted != numPages) {
-		printf("sn%d: memory allocation wrong size.  Weird.\n", ifp->if_unit);
+		printf("%s: memory allocation wrong size.  Weird.\n", ifp->if_xname);
 		/*
 		 * If the allocation was the wrong size we simply release the
 		 * memory once it is granted. Wait for the MMU to be un-busy.
diff --git a/sys/dev/netif/snc/dp83932.c b/sys/dev/netif/snc/dp83932.c
index 0c5c72efe6..37acddfb03 100644
--- a/sys/dev/netif/snc/dp83932.c
+++ b/sys/dev/netif/snc/dp83932.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/dev/snc/dp83932.c,v 1.1.2.2 2003/02/11 08:52:00 nyan Exp $	*/
-/*	$DragonFly: src/sys/dev/netif/snc/Attic/dp83932.c,v 1.5 2003/08/27 09:38:32 rob Exp $	*/
+/*	$DragonFly: src/sys/dev/netif/snc/Attic/dp83932.c,v 1.6 2004/01/06 01:40:49 dillon Exp $	*/
 /*	$NecBSD: dp83932.c,v 1.5 1999/07/29 05:08:44 kmatsuda Exp $	*/
 /*	$NetBSD: if_snc.c,v 1.18 1998/04/25 21:27:40 scottr Exp $	*/
 
@@ -184,8 +184,7 @@ sncconfig(sc, media, nmedia, defmedia, myea)
 #endif
 
 	ifp->if_softc = sc;
-        ifp->if_unit = device_get_unit(sc->sc_dev);
-        ifp->if_name = "snc";
+	if_initname(ifp, "snc", device_get_unit(sc->sc_dev));
 	ifp->if_ioctl = sncioctl;
         ifp->if_output = ether_output;
 	ifp->if_start = sncstart;
diff --git a/sys/dev/netif/sr/if_sr.c b/sys/dev/netif/sr/if_sr.c
index 067f987610..903c3fb959 100644
--- a/sys/dev/netif/sr/if_sr.c
+++ b/sys/dev/netif/sr/if_sr.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/sr/if_sr.c,v 1.48.2.1 2002/06/17 15:10:58 jhay Exp $
- * $DragonFly: src/sys/dev/netif/sr/if_sr.c,v 1.5 2003/11/20 22:07:31 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/sr/if_sr.c,v 1.6 2004/01/06 01:40:49 dillon Exp $
  */
 
 /*
@@ -423,8 +423,7 @@ sr_attach(device_t device)
 #ifndef NETGRAPH
 		ifp = &sc->ifsppp.pp_if;
 		ifp->if_softc = sc;
-		ifp->if_unit = sc->unit;
-		ifp->if_name = "sr";
+		if_initname(ifp, "sr", sc->unit);
 		ifp->if_mtu = PP_MTU;
 		ifp->if_flags = IFF_POINTOPOINT | IFF_MULTICAST;
 		ifp->if_ioctl = srioctl;
@@ -1008,8 +1007,8 @@ srioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	struct sr_softc *sc = ifp->if_softc;
 
 #if BUGGY > 0
-	printf("sr%d: srioctl(ifp=%08x, cmd=%08x, data=%08x)\n",
-	       ifp->if_unit, ifp, cmd, data);
+	printf("%s: srioctl(ifp=%08x, cmd=%08x, data=%08x)\n",
+	       ifp->if_xname, ifp, cmd, data);
 #endif
 
 	was_up = ifp->if_flags & IFF_RUNNING;
@@ -1017,8 +1016,8 @@ srioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	error = sppp_ioctl(ifp, cmd, data);
 
 #if BUGGY > 1
-	printf("sr%d: ioctl: ifsppp.pp_flags = %08x, if_flags %08x.\n",
-	      ifp->if_unit, ((struct sppp *)ifp)->pp_flags, ifp->if_flags);
+	printf("%s: ioctl: ifsppp.pp_flags = %08x, if_flags %08x.\n",
+	      ifp->if_xname, ((struct sppp *)ifp)->pp_flags, ifp->if_flags);
 #endif
 
 	if (error)
diff --git a/sys/dev/netif/ste/if_ste.c b/sys/dev/netif/ste/if_ste.c
index ea6f7e3748..a5a157cf48 100644
--- a/sys/dev/netif/ste/if_ste.c
+++ b/sys/dev/netif/ste/if_ste.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_ste.c,v 1.14.2.9 2003/02/05 22:03:57 mbr Exp $
- * $DragonFly: src/sys/dev/netif/ste/if_ste.c,v 1.6 2003/11/20 22:07:31 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/ste/if_ste.c,v 1.7 2004/01/06 01:40:49 dillon Exp $
  *
  * $FreeBSD: src/sys/pci/if_ste.c,v 1.14.2.9 2003/02/05 22:03:57 mbr Exp $
  */
@@ -1064,8 +1064,7 @@ static int ste_attach(dev)
 
 	ifp = &sc->arpcom.ac_if;
 	ifp->if_softc = sc;
-	ifp->if_unit = unit;
-	ifp->if_name = "ste";
+	if_initname(ifp, "ste", unit);
 	ifp->if_mtu = ETHERMTU;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_ioctl = ste_ioctl;
diff --git a/sys/dev/netif/tl/if_tl.c b/sys/dev/netif/tl/if_tl.c
index 91cdca1008..9b874ea8e2 100644
--- a/sys/dev/netif/tl/if_tl.c
+++ b/sys/dev/netif/tl/if_tl.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_tl.c,v 1.51.2.5 2001/12/16 15:46:08 luigi Exp $
- * $DragonFly: src/sys/dev/netif/tl/if_tl.c,v 1.6 2003/11/20 22:07:31 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/tl/if_tl.c,v 1.7 2004/01/06 01:40:49 dillon Exp $
  *
  * $FreeBSD: src/sys/pci/if_tl.c,v 1.51.2.5 2001/12/16 15:46:08 luigi Exp $
  */
@@ -1292,8 +1292,7 @@ static int tl_attach(dev)
 
 	ifp = &sc->arpcom.ac_if;
 	ifp->if_softc = sc;
-	ifp->if_unit = sc->tl_unit;
-	ifp->if_name = "tl";
+	if_initname(ifp, "tl", sc->tl_unit);
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_ioctl = tl_ioctl;
 	ifp->if_output = ether_output;
@@ -1760,7 +1759,7 @@ static void tl_intr(xsc)
 		r = tl_intvec_rxeoc((void *)sc, type);
 		break;
 	default:
-		printf("tl%d: bogus interrupt type\n", ifp->if_unit);
+		printf("%s: bogus interrupt type\n", ifp->if_xname);
 		break;
 	}
 
diff --git a/sys/dev/netif/tx/if_tx.c b/sys/dev/netif/tx/if_tx.c
index 8cc2fa4963..8ffb8e729f 100644
--- a/sys/dev/netif/tx/if_tx.c
+++ b/sys/dev/netif/tx/if_tx.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/tx/if_tx.c,v 1.61.2.1 2002/10/29 01:43:49 semenu Exp $
- * $DragonFly: src/sys/dev/netif/tx/if_tx.c,v 1.5 2003/11/20 22:07:31 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/tx/if_tx.c,v 1.6 2004/01/06 01:40:49 dillon Exp $
  */
 
 /*
@@ -228,8 +228,7 @@ epic_attach(dev)
 
 	/* Fill ifnet structure */
 	ifp = &sc->sc_if;
-	ifp->if_unit = unit;
-	ifp->if_name = "tx";
+	if_initname(ifp, "tx", unit);
 	ifp->if_softc = sc;
 	ifp->if_flags = IFF_BROADCAST|IFF_SIMPLEX|IFF_MULTICAST;
 	ifp->if_ioctl = epic_ifioctl;
diff --git a/sys/dev/netif/txp/if_txp.c b/sys/dev/netif/txp/if_txp.c
index e798a6cfee..2a2d8baf2c 100644
--- a/sys/dev/netif/txp/if_txp.c
+++ b/sys/dev/netif/txp/if_txp.c
@@ -1,6 +1,6 @@
 /*	$OpenBSD: if_txp.c,v 1.48 2001/06/27 06:34:50 kjc Exp $	*/
 /*	$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.4.2.4 2001/12/14 19:50:43 jlemon Exp $ */
-/*	$DragonFly: src/sys/dev/netif/txp/if_txp.c,v 1.5 2003/11/20 22:07:31 dillon Exp $ */
+/*	$DragonFly: src/sys/dev/netif/txp/if_txp.c,v 1.6 2004/01/06 01:40:50 dillon Exp $ */
 
 /*
  * Copyright (c) 2001
@@ -340,8 +340,7 @@ txp_attach(dev)
 
 	ifp = &sc->sc_arpcom.ac_if;
 	ifp->if_softc = sc;
-	ifp->if_unit = unit;
-	ifp->if_name = "txp";
+	if_initname(ifp, "txp", unit);
 	ifp->if_mtu = ETHERMTU;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_ioctl = txp_ioctl;
diff --git a/sys/dev/netif/vr/if_vr.c b/sys/dev/netif/vr/if_vr.c
index 8b0ea8fc14..fba64b13f7 100644
--- a/sys/dev/netif/vr/if_vr.c
+++ b/sys/dev/netif/vr/if_vr.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_vr.c,v 1.26.2.13 2003/02/06 04:46:20 silby Exp $
- * $DragonFly: src/sys/dev/netif/vr/if_vr.c,v 1.6 2003/11/20 22:07:32 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/vr/if_vr.c,v 1.7 2004/01/06 01:40:50 dillon Exp $
  *
  * $FreeBSD: src/sys/pci/if_vr.c,v 1.26.2.13 2003/02/06 04:46:20 silby Exp $
  */
@@ -875,8 +875,7 @@ static int vr_attach(dev)
 
 	ifp = &sc->arpcom.ac_if;
 	ifp->if_softc = sc;
-	ifp->if_unit = unit;
-	ifp->if_name = "vr";
+	if_initname(ifp, "vr", unit);
 	ifp->if_mtu = ETHERMTU;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_ioctl = vr_ioctl;
diff --git a/sys/dev/netif/vx/if_vx.c b/sys/dev/netif/vx/if_vx.c
index 09a8ac03ed..cd880f7874 100644
--- a/sys/dev/netif/vx/if_vx.c
+++ b/sys/dev/netif/vx/if_vx.c
@@ -28,7 +28,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/vx/if_vx.c,v 1.25.2.6 2002/02/13 00:43:10 dillon Exp $
- * $DragonFly: src/sys/dev/netif/vx/if_vx.c,v 1.7 2003/12/07 19:23:40 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/vx/if_vx.c,v 1.8 2004/01/06 01:40:50 dillon Exp $
  *
  */
 
@@ -155,8 +155,7 @@ vxattach(sc)
 
     printf(" address %6D\n", sc->arpcom.ac_enaddr, ":");
 
-    ifp->if_unit = sc->unit;
-    ifp->if_name = "vx";
+    if_initname(ifp, "vx", sc->unit);
     ifp->if_mtu = ETHERMTU;
     ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
     ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
@@ -494,7 +493,7 @@ readcheck:
 	/* Check if we are stuck and reset [see XXX comment] */
 	if (vxstatus(sc)) {
 	    if (ifp->if_flags & IFF_DEBUG)
-	       printf("vx%d: adapter reset\n", ifp->if_unit);
+	       printf("%s: adapter reset\n", ifp->if_xname);
 	    vxreset(sc);
 	}
     }
@@ -929,7 +928,7 @@ vxwatchdog(ifp)
     struct vx_softc *sc = ifp->if_softc;
 
     if (ifp->if_flags & IFF_DEBUG)
-	printf("vx%d: device timeout\n", ifp->if_unit);
+	printf("%s: device timeout\n", ifp->if_xname);
     ifp->if_flags &= ~IFF_OACTIVE;
     vxstart(ifp);
     vxintr(sc);
diff --git a/sys/dev/netif/wb/if_wb.c b/sys/dev/netif/wb/if_wb.c
index a9d1f18e47..698610f08a 100644
--- a/sys/dev/netif/wb/if_wb.c
+++ b/sys/dev/netif/wb/if_wb.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_wb.c,v 1.26.2.6 2003/03/05 18:42:34 njl Exp $
- * $DragonFly: src/sys/dev/netif/wb/if_wb.c,v 1.6 2003/11/20 22:07:32 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/wb/if_wb.c,v 1.7 2004/01/06 01:40:50 dillon Exp $
  *
  * $FreeBSD: src/sys/pci/if_wb.c,v 1.26.2.6 2003/03/05 18:42:34 njl Exp $
  */
@@ -938,8 +938,7 @@ static int wb_attach(dev)
 
 	ifp = &sc->arpcom.ac_if;
 	ifp->if_softc = sc;
-	ifp->if_unit = unit;
-	ifp->if_name = "wb";
+	if_initname(ifp, "wb", unit);
 	ifp->if_mtu = ETHERMTU;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_ioctl = wb_ioctl;
diff --git a/sys/dev/netif/wi/if_wi.c b/sys/dev/netif/wi/if_wi.c
index 06f4754886..1531e6bffd 100644
--- a/sys/dev/netif/wi/if_wi.c
+++ b/sys/dev/netif/wi/if_wi.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/wi/if_wi.c,v 1.103.2.2 2002/08/02 07:11:34 imp Exp $
- * $DragonFly: src/sys/dev/netif/wi/if_wi.c,v 1.6 2003/11/20 22:07:32 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/wi/if_wi.c,v 1.7 2004/01/06 01:40:50 dillon Exp $
  */
 
 /*
@@ -264,8 +264,7 @@ wi_generic_attach(device_t dev)
 	wi_get_id(sc);
 
 	ifp->if_softc = sc;
-	ifp->if_unit = sc->wi_unit;
-	ifp->if_name = "wi";
+	if_initname(ifp, "wi", sc->wi_unit);
 	ifp->if_mtu = ETHERMTU;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_ioctl = wi_ioctl;
diff --git a/sys/dev/netif/wx/if_wx.c b/sys/dev/netif/wx/if_wx.c
index 077330fcdc..b3de58ee52 100644
--- a/sys/dev/netif/wx/if_wx.c
+++ b/sys/dev/netif/wx/if_wx.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/pci/if_wx.c,v 1.5.2.12 2003/03/05 18:42:34 njl Exp $ */
-/* $DragonFly: src/sys/dev/netif/wx/Attic/if_wx.c,v 1.5 2003/11/20 22:07:32 dillon Exp $ */
+/* $DragonFly: src/sys/dev/netif/wx/Attic/if_wx.c,v 1.6 2004/01/06 01:40:50 dillon Exp $ */
 /*
  * Principal Author: Matthew Jacob <mjacob@feral.com>
  * Copyright (c) 1999, 2001 by Traakan Software
@@ -334,8 +334,7 @@ wx_attach(device_t dev)
 	    sc->w.arpcom.ac_enaddr[4], sc->w.arpcom.ac_enaddr[5]);
 
 	ifp = &sc->w.arpcom.ac_if;
-	ifp->if_unit = device_get_unit(dev);
-	ifp->if_name = "wx";
+	if_initname(ifp, "wx", device_get_unit(dev));
 	ifp->if_mtu = ETHERMTU; /* we always start at ETHERMTU size */
 	ifp->if_output = ether_output;
 	ifp->if_baudrate = 1000000000;
diff --git a/sys/dev/netif/xl/if_xl.c b/sys/dev/netif/xl/if_xl.c
index ff1aea6437..7d0385f4bd 100644
--- a/sys/dev/netif/xl/if_xl.c
+++ b/sys/dev/netif/xl/if_xl.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_xl.c,v 1.72.2.25 2003/02/05 22:03:58 mbr Exp $
- * $DragonFly: src/sys/dev/netif/xl/if_xl.c,v 1.5 2003/11/20 22:07:32 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/xl/if_xl.c,v 1.6 2004/01/06 01:40:50 dillon Exp $
  *
  * $FreeBSD: src/sys/pci/if_xl.c,v 1.72.2.25 2003/02/05 22:03:58 mbr Exp $
  */
@@ -1486,8 +1486,7 @@ xl_attach(dev)
 
 	ifp = &sc->arpcom.ac_if;
 	ifp->if_softc = sc;
-	ifp->if_unit = unit;
-	ifp->if_name = "xl";
+	if_initname(ifp, "xl", unit);
 	ifp->if_mtu = ETHERMTU;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_ioctl = xl_ioctl;
diff --git a/sys/net/faith/if_faith.c b/sys/net/faith/if_faith.c
index 3fc88a3eef..cd41304aad 100644
--- a/sys/net/faith/if_faith.c
+++ b/sys/net/faith/if_faith.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/net/if_faith.c,v 1.3.2.6 2002/04/28 05:40:25 suz Exp $
- * $DragonFly: src/sys/net/faith/if_faith.c,v 1.6 2003/12/30 03:56:01 dillon Exp $
+ * $DragonFly: src/sys/net/faith/if_faith.c,v 1.7 2004/01/06 01:40:50 dillon Exp $
  */
 /*
  * derived from
@@ -166,8 +166,7 @@ faith_clone_create(ifc, unit)
 	bzero(sc, sizeof(struct faith_softc));
 
 	sc->sc_if.if_softc = sc;
-	sc->sc_if.if_name = FAITHNAME;
-	sc->sc_if.if_unit = unit;
+	if_initname(&(sc->sc_if), FAITHNAME, unit);
 
 	sc->sc_if.if_mtu = FAITHMTU;
 	/* Change to BROADCAST experimentaly to announce its prefix. */
diff --git a/sys/net/gif/if_gif.c b/sys/net/gif/if_gif.c
index dc4a6d990f..9a05e1c4da 100644
--- a/sys/net/gif/if_gif.c
+++ b/sys/net/gif/if_gif.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/net/if_gif.c,v 1.4.2.15 2002/11/08 16:57:13 ume Exp $	*/
-/*	$DragonFly: src/sys/net/gif/if_gif.c,v 1.7 2003/12/30 03:56:02 dillon Exp $	*/
+/*	$DragonFly: src/sys/net/gif/if_gif.c,v 1.8 2004/01/06 01:40:50 dillon Exp $	*/
 /*	$KAME: if_gif.c,v 1.87 2001/10/19 08:50:27 itojun Exp $	*/
 
 /*
@@ -137,8 +137,7 @@ gif_clone_create(ifc, unit)
 	bzero(sc, sizeof(struct gif_softc));
 
 	sc->gif_if.if_softc = sc;
-	sc->gif_if.if_name = GIFNAME;
-	sc->gif_if.if_unit = unit;
+	if_initname(&(sc->gif_if), GIFNAME, unit);
 
 	gifattach0(sc);
 
diff --git a/sys/net/gre/if_gre.c b/sys/net/gre/if_gre.c
index 6a38acc8cd..37a1b6d88a 100644
--- a/sys/net/gre/if_gre.c
+++ b/sys/net/gre/if_gre.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: if_gre.c,v 1.42 2002/08/14 00:23:27 itojun Exp $ */
 /*	$FreeBSD: src/sys/net/if_gre.c,v 1.9.2.3 2003/01/23 21:06:44 sam Exp $ */
-/*	$DragonFly: src/sys/net/gre/if_gre.c,v 1.6 2003/12/30 03:56:03 dillon Exp $ */
+/*	$DragonFly: src/sys/net/gre/if_gre.c,v 1.7 2004/01/06 01:40:51 dillon Exp $ */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -166,9 +166,8 @@ gre_clone_create(ifc, unit)
 	sc = malloc(sizeof(struct gre_softc), M_GRE, M_WAITOK);
 	memset(sc, 0, sizeof(struct gre_softc));
 
-	sc->sc_if.if_name = GRENAME;
 	sc->sc_if.if_softc = sc;
-	sc->sc_if.if_unit = unit;
+	if_initname(&(sc->sc_if), GRENAME, unit);
 	sc->sc_if.if_snd.ifq_maxlen = IFQ_MAXLEN;
 	sc->sc_if.if_type = IFT_OTHER;
 	sc->sc_if.if_addrlen = 0;
diff --git a/sys/net/stf/if_stf.c b/sys/net/stf/if_stf.c
index 97f7dab5e3..1bea66c7ad 100644
--- a/sys/net/stf/if_stf.c
+++ b/sys/net/stf/if_stf.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/net/if_stf.c,v 1.1.2.11 2003/01/23 21:06:44 sam Exp $	*/
-/*	$DragonFly: src/sys/net/stf/if_stf.c,v 1.6 2003/09/16 18:05:17 hsu Exp $	*/
+/*	$DragonFly: src/sys/net/stf/if_stf.c,v 1.7 2004/01/06 01:40:51 dillon Exp $	*/
 /*	$KAME: if_stf.c,v 1.73 2001/12/03 11:08:30 keiichi Exp $	*/
 
 /*
@@ -172,8 +172,7 @@ stfmodevent(mod, type, data)
 		sc = stf;
 
 		bzero(sc, sizeof(*sc));
-		sc->sc_if.if_name = "stf";
-		sc->sc_if.if_unit = 0;
+		if_initname(&(sc->sc_if), "stf", 0);
 
 		p = encap_attach_func(AF_INET, IPPROTO_IPV6, stf_encapcheck,
 		    (void *)&in_stf_protosw, sc);
diff --git a/sys/net/tun/if_tun.c b/sys/net/tun/if_tun.c
index 915c7338a6..1e37a891cd 100644
--- a/sys/net/tun/if_tun.c
+++ b/sys/net/tun/if_tun.c
@@ -14,7 +14,7 @@
  * operation though.
  *
  * $FreeBSD: src/sys/net/if_tun.c,v 1.74.2.8 2002/02/13 00:43:11 dillon Exp $
- * $DragonFly: src/sys/net/tun/if_tun.c,v 1.10 2003/09/15 23:38:14 hsu Exp $
+ * $DragonFly: src/sys/net/tun/if_tun.c,v 1.11 2004/01/06 01:40:51 dillon Exp $
  */
 
 #include "opt_atalk.h"
@@ -120,8 +120,7 @@ tuncreate(dev)
 	sc->tun_flags = TUN_INITED;
 
 	ifp = &sc->tun_if;
-	ifp->if_unit = lminor(dev);
-	ifp->if_name = "tun";
+	if_initname(ifp, "tun", lminor(dev));
 	ifp->if_mtu = TUNMTU;
 	ifp->if_ioctl = tunifioctl;
 	ifp->if_output = tunoutput;
@@ -159,7 +158,7 @@ tunopen(dev_t dev, int flag, int mode, struct thread *td)
 	tp->tun_pid = td->td_proc->p_pid;
 	ifp = &tp->tun_if;
 	tp->tun_flags |= TUN_OPEN;
-	TUNDEBUG("%s%d: open\n", ifp->if_name, ifp->if_unit);
+	TUNDEBUG("%s: open\n", ifp->if_xname);
 	return (0);
 }
 
@@ -214,7 +213,7 @@ tunclose(dev_t dev, int foo, int bar, struct thread *td)
 	funsetown(tp->tun_sigio);
 	selwakeup(&tp->tun_rsel);
 
-	TUNDEBUG ("%s%d: closed\n", ifp->if_name, ifp->if_unit);
+	TUNDEBUG ("%s: closed\n", ifp->if_xname);
 	return (0);
 }
 
@@ -226,7 +225,7 @@ tuninit(ifp)
 	struct ifaddr *ifa;
 	int error = 0;
 
-	TUNDEBUG("%s%d: tuninit\n", ifp->if_name, ifp->if_unit);
+	TUNDEBUG("%s: tuninit\n", ifp->if_xname);
 
 	ifp->if_flags |= IFF_UP | IFF_RUNNING;
 	getmicrotime(&ifp->if_lastchange);
@@ -279,18 +278,18 @@ tunifioctl(ifp, cmd, data)
 		break;
 	case SIOCSIFADDR:
 		error = tuninit(ifp);
-		TUNDEBUG("%s%d: address set, error=%d\n",
-			 ifp->if_name, ifp->if_unit, error);
+		TUNDEBUG("%s: address set, error=%d\n",
+			 ifp->if_xname, error);
 		break;
 	case SIOCSIFDSTADDR:
 		error = tuninit(ifp);
-		TUNDEBUG("%s%d: destination address set, error=%d\n",
-			 ifp->if_name, ifp->if_unit, error);
+		TUNDEBUG("%s destination address set, error=%d\n",
+			 ifp->if_xname, error);
 		break;
 	case SIOCSIFMTU:
 		ifp->if_mtu = ifr->ifr_mtu;
-		TUNDEBUG("%s%d: mtu set\n",
-			 ifp->if_name, ifp->if_unit);
+		TUNDEBUG("%s: mtu set\n",
+			 ifp->if_xname);
 		break;
 	case SIOCSIFFLAGS:
 	case SIOCADDMULTI:
@@ -316,11 +315,11 @@ tunoutput(ifp, m0, dst, rt)
 	struct tun_softc *tp = ifp->if_softc;
 	int		s;
 
-	TUNDEBUG ("%s%d: tunoutput\n", ifp->if_name, ifp->if_unit);
+	TUNDEBUG ("%s: tunoutput\n", ifp->if_xname);
 
 	if ((tp->tun_flags & TUN_READY) != TUN_READY) {
-		TUNDEBUG ("%s%d: not ready 0%o\n", ifp->if_name,
-			  ifp->if_unit, tp->tun_flags);
+		TUNDEBUG ("%s: not ready 0%o\n", ifp->if_xname,
+			  tp->tun_flags);
 		m_freem (m0);
 		return EHOSTDOWN;
 	}
@@ -535,10 +534,10 @@ tunread(dev, uio, flag)
 	struct mbuf	*m0;
 	int		error=0, len, s;
 
-	TUNDEBUG ("%s%d: read\n", ifp->if_name, ifp->if_unit);
+	TUNDEBUG ("%s: read\n", ifp->if_xname);
 	if ((tp->tun_flags & TUN_READY) != TUN_READY) {
-		TUNDEBUG ("%s%d: not ready 0%o\n", ifp->if_name,
-			  ifp->if_unit, tp->tun_flags);
+		TUNDEBUG ("%s: not ready 0%o\n", ifp->if_xname,
+			  tp->tun_flags);
 		return EHOSTDOWN;
 	}
 
@@ -570,7 +569,7 @@ tunread(dev, uio, flag)
 	}
 
 	if (m0) {
-		TUNDEBUG("%s%d: Dropping mbuf\n", ifp->if_name, ifp->if_unit);
+		TUNDEBUG("%s: Dropping mbuf\n", ifp->if_xname);
 		m_freem(m0);
 	}
 	return error;
@@ -592,13 +591,13 @@ tunwrite(dev, uio, flag)
 	uint32_t	family;
 	int		isr;
 
-	TUNDEBUG("%s%d: tunwrite\n", ifp->if_name, ifp->if_unit);
+	TUNDEBUG("%s: tunwrite\n", ifp->if_xname);
 
 	if (uio->uio_resid == 0)
 		return 0;
 
 	if (uio->uio_resid < 0 || uio->uio_resid > TUNMRU) {
-		TUNDEBUG("%s%d: len=%d!\n", ifp->if_name, ifp->if_unit,
+		TUNDEBUG("%s: len=%d!\n", ifp->if_xname,
 		    uio->uio_resid);
 		return EIO;
 	}
@@ -725,16 +724,15 @@ tunpoll(dev_t dev, int events, struct thread *td)
 	int		revents = 0;
 
 	s = splimp();
-	TUNDEBUG("%s%d: tunpoll\n", ifp->if_name, ifp->if_unit);
+	TUNDEBUG("%s: tunpoll\n", ifp->if_xname);
 
 	if (events & (POLLIN | POLLRDNORM)) {
 		if (ifp->if_snd.ifq_len > 0) {
-			TUNDEBUG("%s%d: tunpoll q=%d\n", ifp->if_name,
-			    ifp->if_unit, ifp->if_snd.ifq_len);
+			TUNDEBUG("%s: tunpoll q=%d\n", ifp->if_xname,
+			    ifp->if_snd.ifq_len);
 			revents |= events & (POLLIN | POLLRDNORM);
 		} else {
-			TUNDEBUG("%s%d: tunpoll waiting\n", ifp->if_name,
-			    ifp->if_unit);
+			TUNDEBUG("%s: tunpoll waiting\n", ifp->if_xname);
 			selrecord(td, &tp->tun_rsel);
 		}
 	}
diff --git a/sys/net/vlan/if_vlan.c b/sys/net/vlan/if_vlan.c
index 05e49361e0..bc91b29327 100644
--- a/sys/net/vlan/if_vlan.c
+++ b/sys/net/vlan/if_vlan.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/net/if_vlan.c,v 1.15.2.13 2003/02/14 22:25:58 fenner Exp $
- * $DragonFly: src/sys/net/vlan/if_vlan.c,v 1.5 2003/12/30 03:56:04 dillon Exp $
+ * $DragonFly: src/sys/net/vlan/if_vlan.c,v 1.6 2004/01/06 01:40:51 dillon Exp $
  */
 
 /*
@@ -221,8 +221,7 @@ vlan_clone_create(struct if_clone *ifc, int unit)
 	splx(s);
 
 	ifp->if_softc = ifv;
-	ifp->if_name = "vlan";
-	ifp->if_unit = unit;
+	if_initname(ifp, "vlan", unit);
 	/* NB: flags are not set here */
 	ifp->if_linkmib = &ifv->ifv_mib;
 	ifp->if_linkmiblen = sizeof ifv->ifv_mib;
@@ -317,7 +316,7 @@ vlan_start(struct ifnet *ifp)
 		} else {
 			M_PREPEND(m, EVL_ENCAPLEN, M_DONTWAIT);
 			if (m == NULL) {
-				printf("vlan%d: M_PREPEND failed", ifp->if_unit);
+				printf("%s: M_PREPEND failed", ifp->if_xname);
 				ifp->if_ierrors++;
 				continue;
 			}
@@ -325,7 +324,7 @@ vlan_start(struct ifnet *ifp)
 
 			m = m_pullup(m, ETHER_HDR_LEN + EVL_ENCAPLEN);
 			if (m == NULL) {
-				printf("vlan%d: m_pullup failed", ifp->if_unit);
+				printf("%s: m_pullup failed", ifp->if_xname);
 				ifp->if_ierrors++;
 				continue;
 			}
@@ -659,8 +658,8 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	case SIOCGETVLAN:
 		bzero(&vlr, sizeof vlr);
 		if (ifv->ifv_p) {
-			snprintf(vlr.vlr_parent, sizeof(vlr.vlr_parent),
-			    "%s%d", ifv->ifv_p->if_name, ifv->ifv_p->if_unit);
+			strlcpy(vlr.vlr_parent, ifv->ifv_p->if_xname,
+			    sizeof(vlr.vlr_parent));
 			vlr.vlr_tag = ifv->ifv_tag;
 		}
 		error = copyout(&vlr, ifr->ifr_data, sizeof vlr);
-- 
2.41.0