From: Joerg Sonnenberger <joerg@dragonflybsd.org>
Date: Fri, 2 Jul 2004 17:42:21 +0000 (+0000)
Subject: Announce MAC address in ether_ifattach, not in each NIC indepently.
X-Git-Tag: v2.0.1~10935
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/267caeeb1770fe8010fcc94bd5fe0c7f3cc8a044

Announce MAC address in ether_ifattach, not in each NIC indepently.

aue(4), axe(4), cue(4), kue(4), pcn(4):
- Don't bcopy the MAC address, ether_ifattach does it.
lnc(4):
- sc->arpcom.ac_if ==> ifp in lnc_attach_common, more changes coming.
awi(4):
- Nuke local copy of ether_sprintf, use %6D directly.
- Use if_printf instead of printf("%s: ...", sc->sc_dev.dv_xname, ...).
---

diff --git a/sys/dev/netif/an/if_an.c b/sys/dev/netif/an/if_an.c
index 87807a57ac..49b3c40080 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.11 2004/03/23 22:18:58 hsu Exp $
+ * $DragonFly: src/sys/dev/netif/an/if_an.c,v 1.12 2004/07/02 17:42:15 joerg Exp $
  *
  * $FreeBSD: src/sys/dev/an/if_an.c,v 1.2.2.13 2003/02/11 03:32:48 ambrisko Exp $
  */
@@ -743,9 +743,6 @@ an_attach(sc, unit, flags)
 	}
 #endif
 
-	printf("an%d: Ethernet address: %6D\n", sc->an_unit,
-	    sc->arpcom.ac_enaddr, ":");
-
 	ifp->if_softc = sc;
 	if_initname(ifp, "an", unit);
 	ifp->if_mtu = ETHERMTU;
diff --git a/sys/dev/netif/aue/if_aue.c b/sys/dev/netif/aue/if_aue.c
index c289f55213..1182c74d7e 100644
--- a/sys/dev/netif/aue/if_aue.c
+++ b/sys/dev/netif/aue/if_aue.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/usb/if_aue.c,v 1.78 2003/12/17 14:23:07 sanpei Exp $
- * $DragonFly: src/sys/dev/netif/aue/if_aue.c,v 1.11 2004/06/02 14:42:49 eirikn Exp $
+ * $DragonFly: src/sys/dev/netif/aue/if_aue.c,v 1.12 2004/07/02 17:42:15 joerg Exp $
  *
  * $FreeBSD: src/sys/dev/usb/if_aue.c,v 1.19.2.18 2003/06/14 15:56:48 trhodes Exp $
  */
@@ -730,13 +730,6 @@ USB_ATTACH(aue)
 	 */
 	aue_read_eeprom(sc, (caddr_t)&eaddr, 0, 3, 0);
 
-	/*
-	 * A Pegasus chip was detected. Inform the world.
-	 */
-	printf("aue%d: Ethernet address: %6D\n", sc->aue_unit, eaddr, ":");
-
-	bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN);
-
 	ifp = &sc->arpcom.ac_if;
 	ifp->if_softc = sc;
 	if_initname(ifp, "aue", sc->aue_unit);
diff --git a/sys/dev/netif/awi/awi.c b/sys/dev/netif/awi/awi.c
index 198a3c59d2..44ebf72d0e 100644
--- a/sys/dev/netif/awi/awi.c
+++ b/sys/dev/netif/awi/awi.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: awi.c,v 1.26 2000/07/21 04:48:55 onoe Exp $	*/
 /* $FreeBSD: src/sys/dev/awi/awi.c,v 1.10.2.2 2003/01/23 21:06:42 sam Exp $ */
-/* $DragonFly: src/sys/dev/netif/awi/Attic/awi.c,v 1.13 2004/06/02 14:42:49 eirikn Exp $ */
+/* $DragonFly: src/sys/dev/netif/awi/Attic/awi.c,v 1.14 2004/07/02 17:42:16 joerg Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -239,24 +239,7 @@ int awi_dump_len = 28;
 #define llc_snap              llc_un.type_snap
 #endif
 
-#if defined(__DragonFly__) || defined(__FreeBSD__)
-#if defined(__DragonFly__) || __FreeBSD__ >= 4
 devclass_t awi_devclass;
-#endif
-
-/* NetBSD compatible functions  */
-static char * ether_sprintf (u_int8_t *);
-
-static char *
-ether_sprintf(enaddr)
-	u_int8_t *enaddr;
-{
-	static char strbuf[18];
-
-	sprintf(strbuf, "%6D", enaddr, ":");
-	return strbuf;
-}
-#endif
 
 int
 awi_attach(sc)
@@ -315,12 +298,9 @@ awi_attach(sc)
 	    ETHER_ADDR_LEN);
 #endif
 
-	printf("%s: IEEE802.11 %s %dMbps (firmware %s)\n",
-	    sc->sc_dev.dv_xname,
+	if_printf(ifp, "IEEE802.11 %s %dMbps (firmware %s)\n",
 	    sc->sc_mib_phy.IEEE_PHY_Type == AWI_PHY_TYPE_FH ? "FH" : "DS",
 	    sc->sc_tx_rate / 10, sc->sc_banner);
-	printf("%s: address %s\n",
-	    sc->sc_dev.dv_xname,  ether_sprintf(sc->sc_mib_addr.aMAC_Address));
 	ether_ifattach(ifp, sc->sc_mib_addr.aMAC_Address);
 
 #ifdef IFM_IEEE80211
@@ -767,9 +747,9 @@ int
 awi_init(sc)
 	struct awi_softc *sc;
 {
+	struct ifnet *ifp = sc->sc_ifp;
 	int error, ostatus;
 	int n;
-	struct ifnet *ifp = sc->sc_ifp;
 #if defined(__DragonFly__) || defined(__FreeBSD__)
 	struct ifmultiaddr *ifma;
 #else
@@ -906,14 +886,13 @@ awi_watchdog(ifp)
 	ocansleep = sc->sc_cansleep;
 	sc->sc_cansleep = 0;
 	if (sc->sc_tx_timer && --sc->sc_tx_timer == 0) {
-		printf("%s: transmit timeout\n", sc->sc_dev.dv_xname);
+		if_printf(ifp, "transmit timeout\n");
 		awi_txint(sc);
 	}
 	if (sc->sc_rx_timer && --sc->sc_rx_timer == 0) {
 		if (ifp->if_flags & IFF_DEBUG) {
-			printf("%s: no recent beacons from %s; rescanning\n",
-			    sc->sc_dev.dv_xname,
-			    ether_sprintf(sc->sc_bss.bssid));
+			if_printf(ifp, "no recent beacons from %6D; rescanning\n",
+				  sc->sc_bss.bssid, ":");
 		}
 		ifp->if_flags &= ~IFF_RUNNING;
 		awi_start_scan(sc);
@@ -1436,6 +1415,7 @@ static int
 awi_init_hw(sc)
 	struct awi_softc *sc;
 {
+	struct ifnet *ifp = sc->sc_ifp;
 	u_int8_t status;
 	u_int16_t intmask;
 	int i, error;
@@ -1456,8 +1436,7 @@ awi_init_hw(sc)
 	/* wait for selftest completion */
 	for (i = 0; ; i++) {
 		if (i >= AWI_SELFTEST_TIMEOUT*hz/1000) {
-			printf("%s: failed to complete selftest (timeout)\n",
-			    sc->sc_dev.dv_xname);
+			if_printf(ifp, "failed to complete selftest (timeout)\n");
 			return ENXIO;
 		}
 		status = awi_read_1(sc, AWI_SELFTEST);
@@ -1472,16 +1451,15 @@ awi_init_hw(sc)
 		}
 	}
 	if (status != AWI_SELFTEST_PASSED) {
-		printf("%s: failed to complete selftest (code %x)\n",
-		    sc->sc_dev.dv_xname, status);
+		if_printf(ifp, "failed to complete selftest (code %x)\n",
+			  status);
 		return ENXIO;
 	}
 
 	/* check banner to confirm firmware write it */
 	awi_read_bytes(sc, AWI_BANNER, sc->sc_banner, AWI_BANNER_LEN);
 	if (memcmp(sc->sc_banner, "PCnetMobile:", 12) != 0) {
-		printf("%s: failed to complete selftest (bad banner)\n",
-		    sc->sc_dev.dv_xname);
+		if_printf(ifp, "failed to complete selftest (bad banner)\n");
 		for (i = 0; i < AWI_BANNER_LEN; i++)
 			printf("%s%02x", i ? ":" : "\t", sc->sc_banner[i]);
 		printf("\n");
@@ -1505,7 +1483,7 @@ awi_init_hw(sc)
 	/* issueing interface test command */
 	error = awi_cmd(sc, AWI_CMD_NOP);
 	if (error) {
-		printf("%s: failed to complete selftest", sc->sc_dev.dv_xname);
+		if_printf(ifp, "failed to complete selftest");
 		if (error == ENXIO)
 			printf(" (no hardware)\n");
 		else if (error != EWOULDBLOCK)
@@ -1536,8 +1514,9 @@ awi_init_mibs(sc)
 	    (error = awi_mib(sc, AWI_CMD_GET_MIB, AWI_MIB_MAC)) != 0 ||
 	    (error = awi_mib(sc, AWI_CMD_GET_MIB, AWI_MIB_MGT)) != 0 ||
 	    (error = awi_mib(sc, AWI_CMD_GET_MIB, AWI_MIB_PHY)) != 0) {
-		printf("%s: failed to get default mib value (error %d)\n",
-		    sc->sc_dev.dv_xname, error);
+		if_printf(sc->sc_ifp,
+			  "failed to get default mib value (error %d)\n",
+			  error);
 		return error;
 	}
 
@@ -1775,8 +1754,7 @@ awi_stop_scan(sc)
   notfound:
 		if (sc->sc_active_scan) {
 			if (ifp->if_flags & IFF_DEBUG)
-				printf("%s: entering passive scan mode\n",
-				    sc->sc_dev.dv_xname);
+				if_printf(ifp, "entering passive scan mode\n");
 			sc->sc_active_scan = 0;
 		}
 		sc->sc_mgt_timer = AWI_PSCAN_WAIT / 1000;
@@ -1786,8 +1764,7 @@ awi_stop_scan(sc)
 	}
 	sbp = NULL;
 	if (ifp->if_flags & IFF_DEBUG)
-		printf("%s:\tmacaddr     ch/pat   sig flag  wep  essid\n",
-		    sc->sc_dev.dv_xname);
+		if_printf(ifp, "\tmacaddr     ch/pat   sig flag  wep  essid\n");
 	for (; bp != NULL; bp = TAILQ_NEXT(bp, list)) {
 		if (bp->fails) {
 			/*
@@ -1835,8 +1812,7 @@ awi_stop_scan(sc)
 		    sizeof(bp->essid)) != 0)
 			fail |= 0x08;
 		if (ifp->if_flags & IFF_DEBUG) {
-			printf(" %c %s", fail ? '-' : '+',
-			    ether_sprintf(bp->esrc));
+			printf(" %c %6D", fail ? '-' : '+', bp->esrc, ":");
 			if (sc->sc_mib_phy.IEEE_PHY_Type == AWI_PHY_TYPE_FH)
 				printf("  %2d/%d%c", bp->pattern, bp->chanset,
 				    fail & 0x01 ? '!' : ' ');
@@ -1936,8 +1912,8 @@ awi_recv_beacon(sc, m0, rxts, rssi)
 	if (ssid[1] > IEEE80211_NWID_LEN) {
 #ifdef AWI_DEBUG
 		if (awi_verbose)
-			printf("awi_recv_beacon: bad ssid len: %d from %s\n",
-			    ssid[1], ether_sprintf(wh->i_addr2));
+			printf("awi_recv_beacon: bad ssid len: %d from %6D\n",
+			    ssid[1], wh->i_addr2, ":");
 #endif
 		return;
 	}
@@ -1989,10 +1965,9 @@ awi_set_ss(sc)
 	sc->sc_status = AWI_ST_SETSS;
 	bp = &sc->sc_bss;
 	if (ifp->if_flags & IFF_DEBUG) {
-		printf("%s: ch %d pat %d id %d dw %d iv %d bss %s ssid ",
-		    sc->sc_dev.dv_xname, bp->chanset,
-		    bp->pattern, bp->index, bp->dwell_time, bp->interval,
-		    ether_sprintf(bp->bssid));
+		if_printf(ifp, "ch %d pat %d id %d dw %d iv %d bss %6D ssid ",
+			  bp->chanset, bp->pattern, bp->index, bp->dwell_time,
+			  bp->interval, bp->bssid, ":");
 		awi_print_essid(bp->essid);
 		printf("\n");
 	}
@@ -2042,12 +2017,11 @@ awi_sync_done(sc)
 		awi_send_auth(sc, 1);
 	} else {
 		if (ifp->if_flags & IFF_DEBUG) {
-			printf("%s: synced with", sc->sc_dev.dv_xname);
+			if_printf(ifp, "synced with");
 			if (sc->sc_no_bssid)
 				printf(" no-bssid");
 			else {
-				printf(" %s ssid ",
-				    ether_sprintf(sc->sc_bss.bssid));
+				printf(" %6D ssid ", sc->sc_bss.bssid, ":");
 				awi_print_essid(sc->sc_bss.essid);
 			}
 			if (sc->sc_mib_phy.IEEE_PHY_Type == AWI_PHY_TYPE_FH)
@@ -2076,8 +2050,8 @@ awi_send_deauth(sc)
 	if (m == NULL)
 		return;
 	if (ifp->if_flags & IFF_DEBUG)
-		printf("%s: sending deauth to %s\n", sc->sc_dev.dv_xname,
-		    ether_sprintf(sc->sc_bss.bssid));
+		if_printf(ifp, "sending deauth to %6D\n",
+			  sc->sc_bss.bssid, ":");
 
 	wh = mtod(m, struct ieee80211_frame *);
 	wh->i_fc[0] = IEEE80211_FC0_VERSION_0 | IEEE80211_FC0_TYPE_MGT |
@@ -2114,8 +2088,8 @@ awi_send_auth(sc, seq)
 		return;
 	sc->sc_status = AWI_ST_AUTH;
 	if (ifp->if_flags & IFF_DEBUG)
-		printf("%s: sending auth to %s\n", sc->sc_dev.dv_xname,
-		    ether_sprintf(sc->sc_bss.bssid));
+		if_printf(ifp, "sending auth to %6D\n",
+			  sc->sc_bss.bssid, ":");
 
 	wh = mtod(m, struct ieee80211_frame *);
 	wh->i_fc[0] = IEEE80211_FC0_VERSION_0 | IEEE80211_FC0_TYPE_MGT |
@@ -2151,6 +2125,7 @@ awi_recv_auth(sc, m0)
 	struct awi_softc *sc;
 	struct mbuf *m0;
 {
+	struct ifnet *ifp = sc->sc_ifp;
 	struct ieee80211_frame *wh;
 	u_int8_t *auth, *eframe;
 	struct awi_bss *bp;
@@ -2159,9 +2134,8 @@ awi_recv_auth(sc, m0)
 	wh = mtod(m0, struct ieee80211_frame *);
 	auth = (u_int8_t *)&wh[1];
 	eframe = mtod(m0, u_int8_t *) + m0->m_len;
-	if (sc->sc_ifp->if_flags & IFF_DEBUG)
-		printf("%s: receive auth from %s\n", sc->sc_dev.dv_xname,
-		    ether_sprintf(wh->i_addr2));
+	if (ifp->if_flags & IFF_DEBUG)
+		if_printf(ifp, "receive auth from %6D\n", wh->i_addr2, ":");
 
 	/* algorithm number */
 	if (LE_READ_2(auth) != IEEE80211_AUTH_ALG_OPEN)
@@ -2183,8 +2157,7 @@ awi_recv_auth(sc, m0)
 	/* status */
 	status = LE_READ_2(auth);
 	if (status != 0) {
-		printf("%s: authentication failed (reason %d)\n",
-		    sc->sc_dev.dv_xname, status);
+		if_printf(ifp, "authentication failed (reason %d)\n", status);
 		for (bp = TAILQ_FIRST(&sc->sc_scan); bp != NULL;
 		    bp = TAILQ_NEXT(bp, list)) {
 			if (memcmp(bp->esrc, sc->sc_bss.esrc, ETHER_ADDR_LEN)
@@ -2216,9 +2189,8 @@ awi_send_asreq(sc, reassoc)
 		return;
 	sc->sc_status = AWI_ST_ASSOC;
 	if (ifp->if_flags & IFF_DEBUG)
-		printf("%s: sending %sassoc req to %s\n", sc->sc_dev.dv_xname,
-		    reassoc ? "re" : "",
-		    ether_sprintf(sc->sc_bss.bssid));
+		if_printf(ifp, "sending %sassoc req to %6D\n",
+		    reassoc ? "re" : "", sc->sc_bss.bssid, ":");
 
 	wh = mtod(m, struct ieee80211_frame *);
 	wh->i_fc[0] = IEEE80211_FC0_VERSION_0 | IEEE80211_FC0_TYPE_MGT;
@@ -2271,6 +2243,7 @@ awi_recv_asresp(sc, m0)
 	struct awi_softc *sc;
 	struct mbuf *m0;
 {
+	struct ifnet *ifp = sc->sc_ifp;
 	struct ieee80211_frame *wh;
 	u_int8_t *asresp, *eframe;
 	u_int16_t status;
@@ -2281,9 +2254,9 @@ awi_recv_asresp(sc, m0)
 	wh = mtod(m0, struct ieee80211_frame *);
 	asresp = (u_int8_t *)&wh[1];
 	eframe = mtod(m0, u_int8_t *) + m0->m_len;
-	if (sc->sc_ifp->if_flags & IFF_DEBUG)
-		printf("%s: receive assoc resp from %s\n", sc->sc_dev.dv_xname,
-		    ether_sprintf(wh->i_addr2));
+	if (ifp->if_flags & IFF_DEBUG)
+		if_printf(ifp, "receive assoc resp from %6D\n",
+			  wh->i_addr2, ":");
 
 	if (!sc->sc_mib_local.Network_Mode)
 		return;
@@ -2295,8 +2268,7 @@ awi_recv_asresp(sc, m0)
 	/* status */
 	status = LE_READ_2(asresp);
 	if (status != 0) {
-		printf("%s: association failed (reason %d)\n",
-		    sc->sc_dev.dv_xname, status);
+		if_printf(ifp, "association failed (reason %d)\n", status);
 		for (bp = TAILQ_FIRST(&sc->sc_scan); bp != NULL;
 		    bp = TAILQ_NEXT(bp, list)) {
 			if (memcmp(bp->esrc, sc->sc_bss.esrc, ETHER_ADDR_LEN)
@@ -2322,9 +2294,9 @@ awi_recv_asresp(sc, m0)
 				rate = AWI_80211_RATE(asresp[2 + i]);
 		}
 	}
-	if (sc->sc_ifp->if_flags & IFF_DEBUG) {
-		printf("%s: associated with %s ssid ",
-		    sc->sc_dev.dv_xname, ether_sprintf(sc->sc_bss.bssid));
+	if (ifp->if_flags & IFF_DEBUG) {
+		if_printf(ifp, "associated with %6D ssid ",
+			  sc->sc_bss.bssid, ":");
 		awi_print_essid(sc->sc_bss.essid);
 		if (sc->sc_mib_phy.IEEE_PHY_Type == AWI_PHY_TYPE_FH)
 			printf(" chanset %d pattern %d\n",
@@ -2335,11 +2307,11 @@ awi_recv_asresp(sc, m0)
 	sc->sc_tx_rate = rate;
 	sc->sc_mgt_timer = 0;
 	sc->sc_rx_timer = 10;
-	sc->sc_ifp->if_timer = 1;
+	ifp->if_timer = 1;
 	sc->sc_status = AWI_ST_RUNNING;
-	sc->sc_ifp->if_flags |= IFF_RUNNING;
+	ifp->if_flags |= IFF_RUNNING;
 	awi_drvstate(sc, AWI_DRV_INFASSOC);
-	awi_start(sc->sc_ifp);
+	awi_start(ifp);
 }
 
 static int
@@ -2478,8 +2450,7 @@ awi_cmd(sc, cmd)
 	case AWI_STAT_BADPARM:
 		return EINVAL;
 	default:
-		printf("%s: command %d failed %x\n",
-		    sc->sc_dev.dv_xname, cmd, status);
+		if_printf(sc->sc_ifp, "command %d failed %x\n", cmd, status);
 		return ENXIO;
 	}
 	return 0;
@@ -2504,8 +2475,7 @@ awi_cmd_done(sc)
 	awi_write_1(sc, AWI_CMD, 0);
 
 	if (status != AWI_STAT_OK) {
-		printf("%s: command %d failed %x\n",
-		    sc->sc_dev.dv_xname, cmd, status);
+		if_printf(sc->sc_ifp, "command %d failed %x\n", cmd, status);
 		return;
 	}
 	switch (sc->sc_status) {
@@ -2633,8 +2603,7 @@ awi_intr_lock(sc)
 		awi_write_1(sc, AWI_LOCKOUT_MAC, 0);
 	}
 	if (status != 0) {
-		printf("%s: failed to lock interrupt\n",
-		    sc->sc_dev.dv_xname);
+		if_printf(sc->sc_ifp, "failed to lock interrupt\n");
 		return ENXIO;
 	}
 	return 0;
@@ -2659,8 +2628,7 @@ awi_cmd_wait(sc)
 		if (sc->sc_invalid)
 			return ENXIO;
 		if (awi_read_1(sc, AWI_CMD) != sc->sc_cmd_inprog) {
-			printf("%s: failed to access hardware\n",
-			    sc->sc_dev.dv_xname);
+			if_printf(sc->sc_ifp, "failed to access hardware\n");
 			sc->sc_invalid = 1;
 			return ENXIO;
 		}
@@ -2740,25 +2708,20 @@ awi_dump_pkt(sc, m, rssi)
 		printf("rx: ");
 	switch (wh->i_fc[1] & IEEE80211_FC1_DIR_MASK) {
 	case IEEE80211_FC1_DIR_NODS:
-		printf("NODS %s", ether_sprintf(wh->i_addr2));
-		printf("->%s", ether_sprintf(wh->i_addr1));
-		printf("(%s)", ether_sprintf(wh->i_addr3));
+		printf("NODS %6D->%6D(%6D)", wh->i_addr2, ":",
+		       wh->i_addr1, ":", wh->i_addr3, ":");
 		break;
 	case IEEE80211_FC1_DIR_TODS:
-		printf("TODS %s", ether_sprintf(wh->i_addr2));
-		printf("->%s", ether_sprintf(wh->i_addr3));
-		printf("(%s)", ether_sprintf(wh->i_addr1));
+		printf("TODS %6D->%6D(%6D)", wh->i_addr2, ":",
+		       wh->i_addr3, ":", wh->i_addr1, ":");
 		break;
 	case IEEE80211_FC1_DIR_FROMDS:
-		printf("FRDS %s", ether_sprintf(wh->i_addr3));
-		printf("->%s", ether_sprintf(wh->i_addr1));
-		printf("(%s)", ether_sprintf(wh->i_addr2));
+		printf("FRDS %6D->%6D(%6D)", wh->i_addr3, ":",
+		       wh->i_addr1, ":", wh->i_addr2, ":");
 		break;
 	case IEEE80211_FC1_DIR_DSTODS:
-		printf("DSDS %s", ether_sprintf((u_int8_t *)&wh[1]));
-		printf("->%s", ether_sprintf(wh->i_addr3));
-		printf("(%s", ether_sprintf(wh->i_addr2));
-		printf("->%s)", ether_sprintf(wh->i_addr1));
+		printf("DSDS %6D->%6D(%6D->%6D)", (u_int8_t *)&wh[1], ":",
+		       wh->i_addr3, ":", wh->i_addr2, ":", wh->i_addr1, ":");
 		break;
 	}
 	switch (wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK) {
diff --git a/sys/dev/netif/axe/if_axe.c b/sys/dev/netif/axe/if_axe.c
index e7d5c76459..718cc36c77 100644
--- a/sys/dev/netif/axe/if_axe.c
+++ b/sys/dev/netif/axe/if_axe.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/usb/if_axe.c,v 1.10 2003/12/08 07:54:14 obrien Exp $
- * $DragonFly: src/sys/dev/netif/axe/if_axe.c,v 1.3 2004/06/02 14:42:49 eirikn Exp $
+ * $DragonFly: src/sys/dev/netif/axe/if_axe.c,v 1.4 2004/07/02 17:42:16 joerg Exp $
  */
 /*
  * ASIX Electronics AX88172 USB 2.0 ethernet driver. Used in the
@@ -491,13 +491,6 @@ USB_ATTACH(axe)
 	 */
 	sc->axe_phyaddrs[0] = sc->axe_phyaddrs[1] = 0xFF;
 
-	/*
-	 * An ASIX chip was detected. Inform the world.
-	 */
-	printf("axe%d: Ethernet address: %6D\n", sc->axe_unit, eaddr, ":");
-
-	bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN);
-
 	ifp = &sc->arpcom.ac_if;
 	ifp->if_softc = sc;
 	if_initname(ifp, "axe", sc->axe_unit);
diff --git a/sys/dev/netif/bfe/if_bfe.c b/sys/dev/netif/bfe/if_bfe.c
index 06c1c550ca..bad9566a48 100644
--- a/sys/dev/netif/bfe/if_bfe.c
+++ b/sys/dev/netif/bfe/if_bfe.c
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/bfe/if_bfe.c 1.4.4.7 2004/03/02 08:41:33 julian Exp  v
- * $DragonFly: src/sys/dev/netif/bfe/if_bfe.c,v 1.5 2004/06/02 14:42:49 eirikn Exp $
+ * $DragonFly: src/sys/dev/netif/bfe/if_bfe.c,v 1.6 2004/07/02 17:42:16 joerg Exp $
  */
 
 #include <sys/param.h>
@@ -384,8 +384,6 @@ bfe_attach(device_t dev)
 
 	bfe_get_config(sc);
 
-	printf("bfe%d: Ethernet address: %6D\n", unit, sc->arpcom.ac_enaddr, ":");
-
 	/* Reset the chip and turn on the PHY */
 	bfe_chip_reset(sc);
 
diff --git a/sys/dev/netif/bge/if_bge.c b/sys/dev/netif/bge/if_bge.c
index ecc804091f..be3112f2cb 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.29 2003/12/01 21:06:59 ambrisko Exp $
- * $DragonFly: src/sys/dev/netif/bge/if_bge.c,v 1.20 2004/06/02 14:42:49 eirikn Exp $
+ * $DragonFly: src/sys/dev/netif/bge/if_bge.c,v 1.21 2004/07/02 17:42:16 joerg Exp $
  *
  */
 
@@ -1756,12 +1756,6 @@ bge_attach(dev)
 		goto fail;
 	}
 
-	/*
-	 * A Broadcom chip was detected. Inform the world.
-	 */
-	printf("bge%d: Ethernet address: %6D\n", unit,
-	    sc->arpcom.ac_enaddr, ":");
-
 	/* Allocate the general information block and ring buffers. */
 	sc->bge_rdata = contigmalloc(sizeof(struct bge_ring_data), M_DEVBUF,
 	    M_NOWAIT, 0, 0xffffffff, PAGE_SIZE, 0);
diff --git a/sys/dev/netif/cs/if_cs.c b/sys/dev/netif/cs/if_cs.c
index 0b5648180f..0aaf3f786d 100644
--- a/sys/dev/netif/cs/if_cs.c
+++ b/sys/dev/netif/cs/if_cs.c
@@ -28,7 +28,7 @@
 
 /*
  * $FreeBSD: src/sys/dev/cs/if_cs.c,v 1.19.2.1 2001/01/25 20:13:48 imp Exp $
- * $DragonFly: src/sys/dev/netif/cs/if_cs.c,v 1.9 2004/06/02 14:42:50 eirikn Exp $
+ * $DragonFly: src/sys/dev/netif/cs/if_cs.c,v 1.10 2004/07/02 17:42:16 joerg Exp $
  *
  * Device driver for Crystal Semiconductor CS8920 based ethernet
  *   adapters. By Maxim Bolotin and Oleg Sharoiko, 27-April-1997
@@ -668,11 +668,6 @@ cs_attach(device_t dev)
 
 	ether_ifattach(ifp, sc->arpcom.ac_enaddr);
 
-
-	if (bootverbose)
-		printf("%s: ethernet address %6D\n",
-		       ifp->if_xname, sc->arpcom.ac_enaddr, ":");
-
 	return (0);
 }
 
diff --git a/sys/dev/netif/cue/if_cue.c b/sys/dev/netif/cue/if_cue.c
index 282a90661a..c42c3b70b5 100644
--- a/sys/dev/netif/cue/if_cue.c
+++ b/sys/dev/netif/cue/if_cue.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/usb/if_cue.c,v 1.45 2003/12/08 07:54:14 obrien Exp $
- * $DragonFly: src/sys/dev/netif/cue/if_cue.c,v 1.10 2004/06/02 14:42:50 eirikn Exp $
+ * $DragonFly: src/sys/dev/netif/cue/if_cue.c,v 1.11 2004/07/02 17:42:16 joerg Exp $
  *
  */
 
@@ -512,13 +512,6 @@ USB_ATTACH(cue)
 	 */
 	cue_getmac(sc, &eaddr);
 
-	/*
-	 * A CATC chip was detected. Inform the world.
-	 */
-	printf("cue%d: Ethernet address: %6D\n", sc->cue_unit, eaddr, ":");
-
-	bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN);
-
 	ifp = &sc->arpcom.ac_if;
 	ifp->if_softc = sc;
 	if_initname(ifp, "cue", sc->cue_unit);
diff --git a/sys/dev/netif/dc/if_dc.c b/sys/dev/netif/dc/if_dc.c
index cab9cc989f..aef07d4f7a 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.13 2004/06/02 14:42:50 eirikn Exp $
+ * $DragonFly: src/sys/dev/netif/dc/if_dc.c,v 1.14 2004/07/02 17:42:16 joerg Exp $
  *
  * $FreeBSD: src/sys/pci/if_dc.c,v 1.9.2.45 2003/06/08 14:31:53 mux Exp $
  */
@@ -2034,11 +2034,6 @@ static int dc_attach(dev)
 		break;
 	}
 
-	/*
-	 * A 21143 or clone chip was detected. Inform the world.
-	 */
-	printf("dc%d: Ethernet address: %6D\n", unit, eaddr, ":");
-
 	sc->dc_unit = unit;
 
 	sc->dc_ldata = contigmalloc(sizeof(struct dc_list_data), M_DEVBUF,
diff --git a/sys/dev/netif/de/if_de.c b/sys/dev/netif/de/if_de.c
index 52f26f036d..e5029a5816 100644
--- a/sys/dev/netif/de/if_de.c
+++ b/sys/dev/netif/de/if_de.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: if_de.c,v 1.86 1999/06/01 19:17:59 thorpej Exp $	*/
 
 /* $FreeBSD: src/sys/pci/if_de.c,v 1.123.2.4 2000/08/04 23:25:09 peter Exp $ */
-/* $DragonFly: src/sys/dev/netif/de/if_de.c,v 1.12 2004/06/02 14:42:50 eirikn Exp $ */
+/* $DragonFly: src/sys/dev/netif/de/if_de.c,v 1.13 2004/07/02 17:42:16 joerg Exp $ */
 
 /*-
  * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -4856,8 +4856,6 @@ tulip_attach(
 	   sc->tulip_revinfo & 0x0F,
 	   (sc->tulip_features & (TULIP_HAVE_ISVSROM|TULIP_HAVE_OKSROM))
 		 == TULIP_HAVE_ISVSROM ? " (invalid EESPROM checksum)" : "");
-    printf("%s%d: address %6D\n",
-	   sc->tulip_name, sc->tulip_unit, sc->tulip_enaddr, ":");
 
 #if defined(__alpha__)
     /*
diff --git a/sys/dev/netif/ed/if_ed.c b/sys/dev/netif/ed/if_ed.c
index da00ef7263..870c3c786e 100644
--- a/sys/dev/netif/ed/if_ed.c
+++ b/sys/dev/netif/ed/if_ed.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ed/if_ed.c,v 1.224 2003/12/08 07:54:12 obrien Exp $
- * $DragonFly: src/sys/dev/netif/ed/if_ed.c,v 1.13 2004/06/02 14:42:50 eirikn Exp $
+ * $DragonFly: src/sys/dev/netif/ed/if_ed.c,v 1.14 2004/07/02 17:42:16 joerg Exp $
  */
 
 /*
@@ -1761,11 +1761,6 @@ ed_attach(device_t dev)
 
 	/* device attach does transition from UNCONFIGURED to IDLE state */
 
-	/*
-	 * Print additional info when attached
-	 */
-	if_printf(ifp, "address %6D, ", sc->arpcom.ac_enaddr, ":");
-
 	if (sc->type_str && (*sc->type_str != 0))
 		printf("type %s ", sc->type_str);
 	else
diff --git a/sys/dev/netif/el/if_el.c b/sys/dev/netif/el/if_el.c
index c0bf1f5245..a44f4906b6 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.9 2004/06/02 14:42:50 eirikn Exp $
+ * $DragonFly: src/sys/dev/netif/el/if_el.c,v 1.10 2004/07/02 17:42:17 joerg Exp $
  */
 /* Except of course for the portions of code lifted from other FreeBSD
  * drivers (mainly elread, elget and el_ioctl)
@@ -198,10 +198,6 @@ el_attach(struct isa_device *idev)
 	dprintf(("Attaching interface...\n"));
 	ether_ifattach(ifp, sc->arpcom.ac_enaddr);
 
-	/* Print out some information for the user */
-	printf("el%d: 3c501 address %6D\n",idev->id_unit,
-	  sc->arpcom.ac_enaddr, ":");
-
 	dprintf(("el_attach() finished.\n"));
 	return(1);
 }
diff --git a/sys/dev/netif/ep/if_ep.c b/sys/dev/netif/ep/if_ep.c
index d01f90419d..c0adfd6e51 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.10 2004/06/02 14:42:51 eirikn Exp $
+ * $DragonFly: src/sys/dev/netif/ep/if_ep.c,v 1.11 2004/07/02 17:42:17 joerg Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -284,9 +284,6 @@ ep_attach(sc)
 	for (i = 0; i < 3; i++) {
 		outw(BASE + EP_W2_ADDR_0 + (i * 2), ntohs(p[i]));
 	}
-
-	device_printf(sc->dev, "Ethernet address %6D\n",
-			sc->arpcom.ac_enaddr, ":");
   
 	ifp = &sc->arpcom.ac_if;
 	attached = (ifp->if_softc != 0);
diff --git a/sys/dev/netif/ex/if_ex.c b/sys/dev/netif/ex/if_ex.c
index f7e69bc389..60ff4fefd1 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.10 2004/06/02 14:42:51 eirikn Exp $
+ * $DragonFly: src/sys/dev/netif/ex/if_ex.c,v 1.11 2004/07/02 17:42:17 joerg Exp $
  *
  * MAINTAINER: Matthew N. Dodd <winter@jurai.net>
  *                             <mdodd@FreeBSD.org>
@@ -267,9 +267,6 @@ ex_attach(device_t dev)
 	 */
 	ether_ifattach(ifp, sc->arpcom.ac_enaddr);
 
-	device_printf(sc->dev, "Ethernet address %6D\n",
-			sc->arpcom.ac_enaddr, ":");
-
 	return(0);
 }
 
diff --git a/sys/dev/netif/fe/if_fe.c b/sys/dev/netif/fe/if_fe.c
index 2ec31899a8..6bb28dc07f 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.9 2004/06/02 14:42:51 eirikn Exp $
+ * $DragonFly: src/sys/dev/netif/fe/if_fe.c,v 1.10 2004/07/02 17:42:17 joerg Exp $
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * Contributed by M. Sekiguchi. <seki@sysrap.cs.fujitsu.co.jp>
@@ -836,8 +836,7 @@ fe_attach (device_t dev)
 	fe_stop(sc);
   
   	/* Print additional info when attached.  */
- 	device_printf(dev, "address %6D, type %s%s\n",
-		      sc->sc_enaddr, ":" , sc->typestr,
+ 	device_printf(dev, "type %s%s\n", sc->typestr,
 		      (sc->proto_dlcr4 & FE_D4_DSC) ? ", full duplex" : "");
 	if (bootverbose) {
 		int buf, txb, bbw, sbw, ram;
diff --git a/sys/dev/netif/fxp/if_fxp.c b/sys/dev/netif/fxp/if_fxp.c
index e6a96885d3..5733c04ae2 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.12 2004/06/02 14:42:51 eirikn Exp $
+ * $DragonFly: src/sys/dev/netif/fxp/if_fxp.c,v 1.13 2004/07/02 17:42:17 joerg Exp $
  */
 
 /*
@@ -613,9 +613,8 @@ fxp_attach(device_t dev)
 	 * Read MAC address.
 	 */
 	fxp_read_eeprom(sc, (u_int16_t *)sc->arpcom.ac_enaddr, 0, 3);
-	device_printf(dev, "Ethernet address %6D%s\n",
-	    sc->arpcom.ac_enaddr, ":",
-	    sc->flags & FXP_FLAG_SERIAL_MEDIA ? ", 10Mbps" : "");
+	if (sc->flags & FXP_FLAG_SERIAL_MEDIA)
+		device_printf(dev, "10Mbps");
 	if (bootverbose) {
 		device_printf(dev, "PCI IDs: %04x %04x %04x %04x %04x\n",
 		    pci_get_vendor(dev), pci_get_device(dev),
diff --git a/sys/dev/netif/gx/if_gx.c b/sys/dev/netif/gx/if_gx.c
index 1f973f5caa..bf268ec057 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.8 2004/06/02 14:42:51 eirikn Exp $
+ * $DragonFly: src/sys/dev/netif/gx/Attic/if_gx.c,v 1.9 2004/07/02 17:42:17 joerg Exp $
  */
 
 #include <sys/param.h>
@@ -319,8 +319,6 @@ gx_attach(device_t dev)
 		error = ENXIO;
 		goto fail;
 	}
-	device_printf(dev, "Ethernet address: %6D\n",
-	    gx->arpcom.ac_enaddr, ":");
 
 	/* Allocate the ring buffers. */
 	gx->gx_rdata = contigmalloc(sizeof(struct gx_ring_data), M_DEVBUF,
diff --git a/sys/dev/netif/ie/if_ie.c b/sys/dev/netif/ie/if_ie.c
index 9a604bc87c..f079777bcf 100644
--- a/sys/dev/netif/ie/if_ie.c
+++ b/sys/dev/netif/ie/if_ie.c
@@ -48,7 +48,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ie/if_ie.c,v 1.72.2.4 2003/03/27 21:01:49 mdodd Exp $
- * $DragonFly: src/sys/dev/netif/ie/if_ie.c,v 1.12 2004/06/02 14:42:52 eirikn Exp $
+ * $DragonFly: src/sys/dev/netif/ie/if_ie.c,v 1.13 2004/07/02 17:42:17 joerg Exp $
  */
 
 /*
@@ -811,10 +811,8 @@ ieattach(struct isa_device *dvp)
 	ifp->if_softc = ie;
 	if_initname(ifp, iedriver.name, unit);
 	ifp->if_mtu = ETHERMTU;
-	printf("ie%d: <%s R%d> address %6D\n", unit,
-	       ie_hardware_names[ie->hard_type],
-	       ie->hard_vers + 1,
-	       ie->arpcom.ac_enaddr, ":");
+	if_printf(ifp, "<%s R%d>", ie_hardware_names[ie->hard_type],
+		  ie->hard_vers + 1);
 
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_output = ether_output;
diff --git a/sys/dev/netif/kue/if_kue.c b/sys/dev/netif/kue/if_kue.c
index fa544d7da0..c051b015a6 100644
--- a/sys/dev/netif/kue/if_kue.c
+++ b/sys/dev/netif/kue/if_kue.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  *  $FreeBSD: src/sys/dev/usb/if_kue.c,v 1.17.2.9 2003/04/13 02:39:25 murray Exp $
- * $DragonFly: src/sys/dev/netif/kue/if_kue.c,v 1.10 2004/06/02 14:42:52 eirikn Exp $
+ * $DragonFly: src/sys/dev/netif/kue/if_kue.c,v 1.11 2004/07/02 17:42:17 joerg Exp $
  */
 
 /*
@@ -476,15 +476,6 @@ USB_ATTACH(kue)
 	sc->kue_mcfilters = malloc(KUE_MCFILTCNT(sc) * ETHER_ADDR_LEN,
 	    M_USBDEV, M_WAITOK);
 
-	/*
-	 * A KLSI chip was detected. Inform the world.
-	 */
-	printf("kue%d: Ethernet address: %6D\n", sc->kue_unit,
-	    sc->kue_desc.kue_macaddr, ":");
-
-	bcopy(sc->kue_desc.kue_macaddr,
-	    (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN);
-
 	ifp = &sc->arpcom.ac_if;
 	ifp->if_softc = sc;
 	if_initname(ifp, "kue", sc->kue_unit);
diff --git a/sys/dev/netif/le/if_le.c b/sys/dev/netif/le/if_le.c
index 6120fbc1fb..e1fa75e78e 100644
--- a/sys/dev/netif/le/if_le.c
+++ b/sys/dev/netif/le/if_le.c
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/isa/if_le.c,v 1.56.2.4 2002/06/05 23:24:10 paul Exp $
- * $DragonFly: src/sys/dev/netif/le/if_le.c,v 1.12 2004/06/02 14:42:53 eirikn Exp $
+ * $DragonFly: src/sys/dev/netif/le/if_le.c,v 1.13 2004/07/02 17:42:17 joerg Exp $
  */
 
 /*
@@ -343,10 +343,6 @@ le_attach(
     dvp->id_ointr = le_intr;
     ifp->if_softc = sc;
     ifp->if_mtu = ETHERMTU;
-    printf("%s: %s ethernet address %6D\n",
-	   ifp->if_xname,
-	   sc->le_prodname,
-	   sc->le_ac.ac_enaddr, ":");
 
     ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
     ifp->if_output = ether_output;
diff --git a/sys/dev/netif/lge/if_lge.c b/sys/dev/netif/lge/if_lge.c
index c5bd622187..b459bc4f37 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.11 2004/06/02 14:42:53 eirikn Exp $
+ * $DragonFly: src/sys/dev/netif/lge/if_lge.c,v 1.12 2004/07/02 17:42:18 joerg Exp $
  *
  * $FreeBSD: src/sys/dev/lge/if_lge.c,v 1.5.2.2 2001/12/14 19:49:23 jlemon Exp $
  */
@@ -600,11 +600,6 @@ static int lge_attach(dev)
 	lge_read_eeprom(sc, (caddr_t)&eaddr[2], LGE_EE_NODEADDR_1, 1, 0);
 	lge_read_eeprom(sc, (caddr_t)&eaddr[4], LGE_EE_NODEADDR_2, 1, 0);
 
-	/*
-	 * A Level 1 chip was detected. Inform the world.
-	 */
-	printf("lge%d: Ethernet address: %6D\n", unit, eaddr, ":");
-
 	sc->lge_unit = unit;
 	callout_handle_init(&sc->lge_stat_ch);
 
diff --git a/sys/dev/netif/lnc/if_lnc.c b/sys/dev/netif/lnc/if_lnc.c
index 1c0058d5db..0e1d634d3d 100644
--- a/sys/dev/netif/lnc/if_lnc.c
+++ b/sys/dev/netif/lnc/if_lnc.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/lnc/if_lnc.c,v 1.89 2001/07/04 13:00:19 nyan Exp $
- * $DragonFly: src/sys/dev/netif/lnc/Attic/if_lnc.c,v 1.10 2004/06/02 14:42:53 eirikn Exp $
+ * $DragonFly: src/sys/dev/netif/lnc/Attic/if_lnc.c,v 1.11 2004/07/02 17:42:18 joerg Exp $
  */
 
 /*
@@ -868,8 +868,8 @@ lnc_tint(struct lnc_softc *sc)
 int
 lnc_attach_common(device_t dev)
 {
-	int unit = device_get_unit(dev);
 	lnc_softc_t *sc = device_get_softc(dev);
+	struct ifnet *ifp = &sc->arpcom.ac_if;
 	int i;
 	int skip;
 
@@ -888,16 +888,16 @@ lnc_attach_common(device_t dev)
 
 	/* Fill in arpcom structure entries */
 
-	sc->arpcom.ac_if.if_softc = sc;
-	if_initname(&(sc->arpcom.ac_if), "lnc", unit);
-	sc->arpcom.ac_if.if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
-	sc->arpcom.ac_if.if_timer = 0;
-	sc->arpcom.ac_if.if_output = ether_output;
-	sc->arpcom.ac_if.if_start = lnc_start;
-	sc->arpcom.ac_if.if_ioctl = lnc_ioctl;
-	sc->arpcom.ac_if.if_watchdog = lnc_watchdog;
-	sc->arpcom.ac_if.if_init = lnc_init;
-	sc->arpcom.ac_if.if_snd.ifq_maxlen = IFQ_MAXLEN;
+	ifp->if_softc = sc;
+	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
+	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
+	ifp->if_timer = 0;
+	ifp->if_output = ether_output;
+	ifp->if_start = lnc_start;
+	ifp->if_ioctl = lnc_ioctl;
+	ifp->if_watchdog = lnc_watchdog;
+	ifp->if_init = lnc_init;
+	ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
 
 	/* Extract MAC address from PROM */
 	for (i = 0; i < ETHER_ADDR_LEN; i++)
@@ -909,13 +909,11 @@ lnc_attach_common(device_t dev)
 
 	ether_ifattach(&sc->arpcom.ac_if, sc->arpcom.ac_enaddr);
 
-	printf("lnc%d: ", unit);
 	if (sc->nic.ic == LANCE || sc->nic.ic == C_LANCE)
-		printf("%s (%s)",
-		       nic_ident[sc->nic.ident], ic_ident[sc->nic.ic]);
+		if_printf(ifp, "%s (%s)", nic_ident[sc->nic.ident],
+			  ic_ident[sc->nic.ic]);
 	else
-		printf("%s", ic_ident[sc->nic.ic]);
-	printf(" address %6D\n", sc->arpcom.ac_enaddr, ":");
+		if_printf(ifp, "%s\n", ic_ident[sc->nic.ic]);
 
 	return (1);
 }
diff --git a/sys/dev/netif/my/if_my.c b/sys/dev/netif/my/if_my.c
index 38f2be9502..243c09716b 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.10 2004/06/02 14:42:53 eirikn Exp $
+ * $DragonFly: src/sys/dev/netif/my/if_my.c,v 1.11 2004/07/02 17:42:18 joerg Exp $
  *
  * Myson fast ethernet PCI NIC driver
  *
@@ -956,11 +956,6 @@ my_attach(device_t dev)
 	for (i = 0; i < ETHER_ADDR_LEN; ++i)
 		eaddr[i] = CSR_READ_1(sc, MY_PAR0 + i);
 
-	/*
-	 * A Myson chip was detected. Inform the world.
-	 */
-	printf("my%d: Ethernet address: %6D\n", unit, eaddr, ":");
-
 	sc->my_unit = unit;
 
 	sc->my_ldata_ptr = malloc(sizeof(struct my_list_data) + 8,
diff --git a/sys/dev/netif/nge/if_nge.c b/sys/dev/netif/nge/if_nge.c
index 7ecb666705..2bea061019 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.11 2004/06/02 14:42:53 eirikn Exp $
+ * $DragonFly: src/sys/dev/netif/nge/if_nge.c,v 1.12 2004/07/02 17:42:18 joerg Exp $
  *
  * $FreeBSD: src/sys/dev/nge/if_nge.c,v 1.13.2.13 2003/02/05 22:03:57 mbr Exp $
  */
@@ -919,11 +919,6 @@ static int nge_attach(dev)
 	nge_read_eeprom(sc, (caddr_t)&eaddr[2], NGE_EE_NODEADDR + 1, 1, 0);
 	nge_read_eeprom(sc, (caddr_t)&eaddr[0], NGE_EE_NODEADDR + 2, 1, 0);
 
-	/*
-	 * A NatSemi chip was detected. Inform the world.
-	 */
-	printf("nge%d: Ethernet address: %6D\n", unit, eaddr, ":");
-
 	sc->nge_unit = unit;
 
 	sc->nge_ldata = contigmalloc(sizeof(struct nge_list_data), M_DEVBUF,
diff --git a/sys/dev/netif/pcn/if_pcn.c b/sys/dev/netif/pcn/if_pcn.c
index d0494adf7f..0b15b5b172 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.10 2004/06/02 14:42:53 eirikn Exp $
+ * $DragonFly: src/sys/dev/netif/pcn/if_pcn.c,v 1.11 2004/07/02 17:42:18 joerg Exp $
  *
  * $FreeBSD: src/sys/pci/if_pcn.c,v 1.5.2.10 2003/03/05 18:42:33 njl Exp $
  */
@@ -595,13 +595,6 @@ static int pcn_attach(dev)
 	 */
 	eaddr[0] = CSR_READ_4(sc, PCN_IO32_APROM00);
 	eaddr[1] = CSR_READ_4(sc, PCN_IO32_APROM01);
-	bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN);
-
-	/*
-	 * An AMD chip was detected. Inform the world.
-	 */
-	printf("pcn%d: Ethernet address: %6D\n", unit,
-	    sc->arpcom.ac_enaddr, ":");
 
 	sc->pcn_unit = unit;
 	callout_handle_init(&sc->pcn_stat_ch);
@@ -650,7 +643,7 @@ static int pcn_attach(dev)
 	/*
 	 * Call MI attach routine.
 	 */
-	ether_ifattach(ifp, sc->arpcom.ac_enaddr);
+	ether_ifattach(ifp, eaddr);
 	callout_handle_init(&sc->pcn_stat_ch);
 
 fail:
diff --git a/sys/dev/netif/ray/if_ray.c b/sys/dev/netif/ray/if_ray.c
index f7eb88d95e..01303de4ec 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.12 2004/06/02 14:42:54 eirikn Exp $
+ * $DragonFly: src/sys/dev/netif/ray/Attic/if_ray.c,v 1.13 2004/07/02 17:42:18 joerg Exp $
  *
  */
 
@@ -536,7 +536,6 @@ ray_attach(device_t dev)
 		else
 			printf(".  Firmware version 5\n");
 		printf(".  Status 0x%b\n", ep->e_status, RAY_ECFS_PRINTFB);
-		printf(".  Ether address %6D\n", ep->e_station_addr, ":");
 		if (sc->sc_version == RAY_ECFS_BUILD_4) {
 			printf(".  Program checksum %0x\n", ep->e_resv0);
 			printf(".  CIS checksum %0x\n", ep->e_rates[0]);
diff --git a/sys/dev/netif/rdp/if_rdp.c b/sys/dev/netif/rdp/if_rdp.c
index 1462086ffa..04b5e87aa3 100644
--- a/sys/dev/netif/rdp/if_rdp.c
+++ b/sys/dev/netif/rdp/if_rdp.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/isa/if_rdp.c,v 1.6.2.2 2000/07/17 21:24:32 archie Exp $
- * $DragonFly: src/sys/dev/netif/rdp/if_rdp.c,v 1.10 2004/06/02 14:42:54 eirikn Exp $
+ * $DragonFly: src/sys/dev/netif/rdp/if_rdp.c,v 1.11 2004/07/02 17:42:18 joerg Exp $
  */
 
 /*
@@ -623,8 +623,6 @@ rdp_attach(struct isa_device *isa_dev)
 	       "8002",		/* hook for 8012 */
 	       sc->eeprom == EEPROM_93C46? "93C46": "74S288",
 	       sc->slow? "slow": "fast");
-	printf("%s: address %6D\n", ifp->if_xname,
-	       sc->arpcom.ac_enaddr, ":");
 
 	return 1;
 }
diff --git a/sys/dev/netif/rl/if_rl.c b/sys/dev/netif/rl/if_rl.c
index 82fc85736d..2f9ed56007 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.11 2004/06/02 14:42:54 eirikn Exp $
+ * $DragonFly: src/sys/dev/netif/rl/if_rl.c,v 1.12 2004/07/02 17:42:18 joerg Exp $
  *
  * $FreeBSD: src/sys/pci/if_rl.c,v 1.38.2.16 2003/03/05 18:42:33 njl Exp $
  */
@@ -903,11 +903,6 @@ static int rl_attach(dev)
 	 */
 	rl_read_eeprom(sc, (caddr_t)&eaddr, RL_EE_EADDR, 3, 0);
 
-	/*
-	 * A RealTek chip was detected. Inform the world.
-	 */
-	printf("rl%d: Ethernet address: %6D\n", unit, eaddr, ":");
-
 	sc->rl_unit = unit;
 
 	/*
diff --git a/sys/dev/netif/sbni/if_sbni.c b/sys/dev/netif/sbni/if_sbni.c
index a66f5a1606..09b4493a69 100644
--- a/sys/dev/netif/sbni/if_sbni.c
+++ b/sys/dev/netif/sbni/if_sbni.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/sbni/if_sbni.c,v 1.1.2.4 2002/08/11 09:32:00 fjoe Exp $
- * $DragonFly: src/sys/dev/netif/sbni/if_sbni.c,v 1.13 2004/06/02 14:42:54 eirikn Exp $
+ * $DragonFly: src/sys/dev/netif/sbni/if_sbni.c,v 1.14 2004/07/02 17:42:18 joerg Exp $
  */
 
 /*
@@ -247,8 +247,7 @@ sbni_attach(struct sbni_softc *sc, int unit, struct sbni_flags flags)
 
 	/* device attach does transition from UNCONFIGURED to IDLE state */
 
-	printf("%s: speed %ld, address %6D, rxl ", ifp->if_xname,
-	       ifp->if_baudrate, sc->arpcom.ac_enaddr, ":");
+	if_printf(ifp, "speed %ld, rxl ", ifp->if_baudrate);
 	if (sc->delta_rxl)
 		printf("auto\n");
 	else
diff --git a/sys/dev/netif/sf/if_sf.c b/sys/dev/netif/sf/if_sf.c
index 79bb6cc3cd..62ca2960f4 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.9 2004/06/02 14:42:54 eirikn Exp $
+ * $DragonFly: src/sys/dev/netif/sf/if_sf.c,v 1.10 2004/07/02 17:42:19 joerg Exp $
  *
  * $FreeBSD: src/sys/pci/if_sf.c,v 1.18.2.8 2001/12/16 15:46:07 luigi Exp $
  */
@@ -779,12 +779,6 @@ static int sf_attach(dev)
 		sc->arpcom.ac_enaddr[i] =
 		    sf_read_eeprom(sc, SF_EE_NODEADDR + ETHER_ADDR_LEN - i);
 
-	/*
-	 * An Adaptec chip was detected. Inform the world.
-	 */
-	printf("sf%d: Ethernet address: %6D\n", unit,
-	    sc->arpcom.ac_enaddr, ":");
-
 	sc->sf_unit = unit;
 
 	/* Allocate the descriptor queues. */
diff --git a/sys/dev/netif/sis/if_sis.c b/sys/dev/netif/sis/if_sis.c
index 821ae9c683..8d7d852bd1 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.15 2004/06/02 14:42:54 eirikn Exp $
+ * $DragonFly: src/sys/dev/netif/sis/if_sis.c,v 1.16 2004/07/02 17:42:19 joerg Exp $
  *
  * $FreeBSD: src/sys/pci/if_sis.c,v 1.13.4.24 2003/03/05 18:42:33 njl Exp $
  */
@@ -1154,11 +1154,6 @@ sis_attach(device_t dev)
 		break;
 	}
 
-	/*
-	 * A SiS chip was detected. Inform the world.
-	 */
-	device_printf(dev, "Ethernet address: %6D\n", eaddr, ":");
-
 	callout_init(&sc->sis_timer);
 
 	/*
diff --git a/sys/dev/netif/sk/if_sk.c b/sys/dev/netif/sk/if_sk.c
index cfe171d50d..f3cb39d53b 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.15 2004/06/02 14:42:54 eirikn Exp $
+ * $DragonFly: src/sys/dev/netif/sk/if_sk.c,v 1.16 2004/07/02 17:42:19 joerg Exp $
  *
  * $FreeBSD: src/sys/pci/if_sk.c,v 1.19.2.9 2003/03/05 18:42:34 njl Exp $
  */
@@ -1408,9 +1408,6 @@ static int sk_attach(dev)
 		sc_if->arpcom.ac_enaddr[i] =
 		    sk_win_read_1(sc, SK_MAC0_0 + (port * 8) + i);
 
-	printf("sk%d: Ethernet address: %6D\n",
-	    sc_if->sk_unit, sc_if->arpcom.ac_enaddr, ":");
-
 	/*
 	 * Set up RAM buffer addresses. The NIC will have a certain
 	 * amount of SRAM on it, somewhere between 512K and 2MB. We
diff --git a/sys/dev/netif/sn/if_sn.c b/sys/dev/netif/sn/if_sn.c
index e35cd2a643..ed07ae899a 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.9 2004/06/02 14:42:55 eirikn Exp $
+ *   $DragonFly: src/sys/dev/netif/sn/if_sn.c,v 1.10 2004/07/02 17:42:19 joerg Exp $
  */
 
 /*
@@ -192,7 +192,7 @@ sn_attach(device_t dev)
 
 	SMC_SELECT_BANK(1);
 	i = inw(BASE + CONFIG_REG_W);
-	printf(i & CR_AUI_SELECT ? "AUI" : "UTP");
+	printf("%s\n", i & CR_AUI_SELECT ? "AUI" : "UTP");
 
 	if (sc->pccard_enaddr)
 		for (j = 0; j < 3; j++) {
@@ -214,7 +214,6 @@ sn_attach(device_t dev)
 		p[i + 1] = address >> 8;
 		p[i] = address & 0xFF;
 	}
-	printf(" MAC address %6D\n", sc->arpcom.ac_enaddr, ":");
 	ifp->if_softc = sc;
 	if_initname(ifp, "sn", device_get_unit(dev));
 	ifp->if_mtu = ETHERMTU;
diff --git a/sys/dev/netif/snc/dp83932.c b/sys/dev/netif/snc/dp83932.c
index 6f93b2604f..8e9463f86e 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.9 2004/06/02 14:42:55 eirikn Exp $	*/
+/*	$DragonFly: src/sys/dev/netif/snc/Attic/dp83932.c,v 1.10 2004/07/02 17:42:19 joerg 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 $	*/
 
@@ -175,7 +175,6 @@ sncconfig(sc, media, nmedia, defmedia, eaddr)
 		camdump(sc);
 	}
 #endif
-	device_printf(sc->sc_dev, "address %6D\n", eaddr, ":");
 
 #ifdef SNCDEBUG
 	device_printf(sc->sc_dev,
diff --git a/sys/dev/netif/ste/if_ste.c b/sys/dev/netif/ste/if_ste.c
index 08755f1e09..355fd172d8 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.10 2004/06/02 14:42:55 eirikn Exp $
+ * $DragonFly: src/sys/dev/netif/ste/if_ste.c,v 1.11 2004/07/02 17:42:19 joerg Exp $
  *
  * $FreeBSD: src/sys/pci/if_ste.c,v 1.14.2.9 2003/02/05 22:03:57 mbr Exp $
  */
@@ -1027,12 +1027,6 @@ static int ste_attach(dev)
 		goto fail;
 	}
 
-	/*
-	 * A Sundance chip was detected. Inform the world.
-	 */
-	printf("ste%d: Ethernet address: %6D\n", unit,
-	    sc->arpcom.ac_enaddr, ":");
-
 	sc->ste_unit = unit;
 
 	/* Allocate the descriptor queues. */
diff --git a/sys/dev/netif/ti/if_ti.c b/sys/dev/netif/ti/if_ti.c
index 23c8ca2371..572584584c 100644
--- a/sys/dev/netif/ti/if_ti.c
+++ b/sys/dev/netif/ti/if_ti.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_ti.c,v 1.25.2.14 2002/02/15 04:20:20 silby Exp $
- * $DragonFly: src/sys/dev/netif/ti/if_ti.c,v 1.11 2004/06/02 14:42:55 eirikn Exp $
+ * $DragonFly: src/sys/dev/netif/ti/if_ti.c,v 1.12 2004/07/02 17:42:19 joerg Exp $
  *
  * $FreeBSD: src/sys/pci/if_ti.c,v 1.25.2.14 2002/02/15 04:20:20 silby Exp $
  */
@@ -1652,12 +1652,6 @@ static int ti_attach(dev)
 		goto fail;
 	}
 
-	/*
-	 * A Tigon chip was detected. Inform the world.
-	 */
-	printf("ti%d: Ethernet address: %6D\n", unit,
-				sc->arpcom.ac_enaddr, ":");
-
 	/* Allocate the general information block and ring buffers. */
 	sc->ti_rdata = contigmalloc(sizeof(struct ti_ring_data), M_DEVBUF,
 	    M_NOWAIT, 0, 0xffffffff, PAGE_SIZE, 0);
diff --git a/sys/dev/netif/tl/if_tl.c b/sys/dev/netif/tl/if_tl.c
index c8ae00ac33..384a24ab0d 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.10 2004/06/02 14:42:55 eirikn Exp $
+ * $DragonFly: src/sys/dev/netif/tl/if_tl.c,v 1.11 2004/07/02 17:42:19 joerg Exp $
  *
  * $FreeBSD: src/sys/pci/if_tl.c,v 1.51.2.5 2001/12/16 15:46:08 luigi Exp $
  */
@@ -1285,12 +1285,6 @@ static int tl_attach(dev)
                 }
         }
 
-	/*
-	 * A ThunderLAN chip was detected. Inform the world.
-	 */
-	printf("tl%d: Ethernet address: %6D\n", unit,
-				sc->arpcom.ac_enaddr, ":");
-
 	ifp = &sc->arpcom.ac_if;
 	ifp->if_softc = sc;
 	if_initname(ifp, "tl", sc->tl_unit);
diff --git a/sys/dev/netif/tx/if_tx.c b/sys/dev/netif/tx/if_tx.c
index 6b6e9b8d70..ca84ddd90c 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.11 2004/06/02 14:42:55 eirikn Exp $
+ * $DragonFly: src/sys/dev/netif/tx/if_tx.c,v 1.12 2004/07/02 17:42:20 joerg Exp $
  */
 
 /*
@@ -316,9 +316,6 @@ epic_attach(dev)
 		goto fail;
 	}
 
-	/* Display ethernet address ,... */
-	device_printf(dev, "address %6D,", sc->sc_macaddr, ":");
-
 	/* board type and ... */
 	printf(" type ");
 	for(i=0x2c;i<0x32;i++) {
diff --git a/sys/dev/netif/txp/if_txp.c b/sys/dev/netif/txp/if_txp.c
index f41b2570cf..f8c1c67df0 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.11 2004/06/02 14:42:55 eirikn Exp $ */
+/*	$DragonFly: src/sys/dev/netif/txp/if_txp.c,v 1.12 2004/07/02 17:42:20 joerg Exp $ */
 
 /*
  * Copyright (c) 2001
@@ -319,9 +319,6 @@ txp_attach(dev)
 	sc->sc_arpcom.ac_enaddr[4] = ((uint8_t *)&p2)[1];
 	sc->sc_arpcom.ac_enaddr[5] = ((uint8_t *)&p2)[0];
 
-	printf("txp%d: Ethernet address %6D\n", unit,
-	    sc->sc_arpcom.ac_enaddr, ":");
-
 	sc->sc_cold = 0;
 
 	ifmedia_init(&sc->sc_ifmedia, 0, txp_ifmedia_upd, txp_ifmedia_sts);
diff --git a/sys/dev/netif/vr/if_vr.c b/sys/dev/netif/vr/if_vr.c
index a90b0e158d..8d1bbfe1df 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.12 2004/06/29 00:45:15 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/vr/if_vr.c,v 1.13 2004/07/02 17:42:20 joerg Exp $
  *
  * $FreeBSD: src/sys/pci/if_vr.c,v 1.26.2.13 2003/02/06 04:46:20 silby Exp $
  */
@@ -852,11 +852,6 @@ static int vr_attach(dev)
 	for (i = 0; i < ETHER_ADDR_LEN; i++)
 		eaddr[i] = CSR_READ_1(sc, VR_PAR0 + i);
 
-	/*
-	 * A Rhine chip was detected. Inform the world.
-	 */
-	printf("vr%d: Ethernet address: %6D\n", unit, eaddr, ":");
-
 	sc->vr_unit = unit;
 
 	sc->vr_ldata = contigmalloc(sizeof(struct vr_list_data), M_DEVBUF,
diff --git a/sys/dev/netif/vx/if_vx.c b/sys/dev/netif/vx/if_vx.c
index e71bccb74d..9d940dc19f 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.11 2004/06/02 14:42:56 eirikn Exp $
+ * $DragonFly: src/sys/dev/netif/vx/if_vx.c,v 1.12 2004/07/02 17:42:20 joerg Exp $
  *
  */
 
@@ -153,8 +153,6 @@ vxattach(sc)
         sc->arpcom.ac_enaddr[(i << 1) + 1] = x;
     }
 
-    printf(" address %6D\n", sc->arpcom.ac_enaddr, ":");
-
     if_initname(ifp, "vx", sc->unit);
     ifp->if_mtu = ETHERMTU;
     ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
diff --git a/sys/dev/netif/wb/if_wb.c b/sys/dev/netif/wb/if_wb.c
index 8a983c65b1..19ca6e0a78 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.10 2004/06/02 14:42:56 eirikn Exp $
+ * $DragonFly: src/sys/dev/netif/wb/if_wb.c,v 1.11 2004/07/02 17:42:20 joerg Exp $
  *
  * $FreeBSD: src/sys/pci/if_wb.c,v 1.26.2.6 2003/03/05 18:42:34 njl Exp $
  */
@@ -915,11 +915,6 @@ static int wb_attach(dev)
 	 */
 	wb_read_eeprom(sc, (caddr_t)&eaddr, 0, 3, 0);
 
-	/*
-	 * A Winbond chip was detected. Inform the world.
-	 */
-	printf("wb%d: Ethernet address: %6D\n", unit, eaddr, ":");
-
 	sc->wb_unit = unit;
 
 	sc->wb_ldata = contigmalloc(sizeof(struct wb_list_data) + 8, M_DEVBUF,
diff --git a/sys/dev/netif/wi/if_wi.c b/sys/dev/netif/wi/if_wi.c
index cae1da6548..68a3a9f618 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.12 2004/06/25 09:13:30 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/wi/if_wi.c,v 1.13 2004/07/02 17:42:20 joerg Exp $
  */
 
 /*
@@ -260,8 +260,6 @@ wi_generic_attach(device_t dev)
 	bcopy((char *)&mac.wi_mac_addr,
 	   (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN);
 
-	device_printf(dev, "802.11 address: %6D\n", sc->arpcom.ac_enaddr, ":");
-
 	wi_get_id(sc);
 
 	ifp->if_softc = sc;
diff --git a/sys/dev/netif/wl/if_wl.c b/sys/dev/netif/wl/if_wl.c
index 58a6653134..ea3ba60782 100644
--- a/sys/dev/netif/wl/if_wl.c
+++ b/sys/dev/netif/wl/if_wl.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/i386/isa/if_wl.c,v 1.27.2.2 2000/07/17 21:24:32 archie Exp $ */
-/* $DragonFly: src/sys/dev/netif/wl/if_wl.c,v 1.11 2004/06/02 14:42:56 eirikn Exp $ */
+/* $DragonFly: src/sys/dev/netif/wl/if_wl.c,v 1.12 2004/07/02 17:42:20 joerg Exp $ */
 /* 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -508,8 +508,7 @@ wlattach(struct isa_device *id)
     ether_ifattach(ifp, sc->wl_ac.ac_enaddr);
 
     bcopy(&sc->wl_addr[0], sc->wl_ac.ac_enaddr, WAVELAN_ADDR_SIZE);
-    printf("%s: address %6D, NWID 0x%02x%02x", ifp->if_xname,
-           sc->wl_ac.ac_enaddr, ":", sc->nwid[0], sc->nwid[1]);
+    if_printf(ifp, "NWID 0x%02x%02x", sc->nwid[0], sc->nwid[1]);
     if (sc->freq24) 
 	printf(", Freq %d MHz",sc->freq24); 		/* 2.4 Gz       */
     printf("\n");                                       /* 2.4 Gz       */
diff --git a/sys/dev/netif/wx/if_wx.c b/sys/dev/netif/wx/if_wx.c
index 7e64a97e47..6c3cfdefbe 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.9 2004/06/02 14:42:56 eirikn Exp $ */
+/* $DragonFly: src/sys/dev/netif/wx/Attic/if_wx.c,v 1.10 2004/07/02 17:42:20 joerg Exp $ */
 /*
  * Principal Author: Matthew Jacob <mjacob@feral.com>
  * Copyright (c) 1999, 2001 by Traakan Software
@@ -328,7 +328,6 @@ wx_attach(device_t dev)
 		error = ENXIO;
 		goto out;
 	}
-	device_printf(dev, "Ethernet address %6D\n", sc->w.arpcom.ac_enaddr, ":");
 
 	ifp = &sc->w.arpcom.ac_if;
 	if_initname(ifp, "wx", device_get_unit(dev));
diff --git a/sys/dev/netif/xe/if_xe.c b/sys/dev/netif/xe/if_xe.c
index ba8ffa2491..b74afe64bc 100644
--- a/sys/dev/netif/xe/if_xe.c
+++ b/sys/dev/netif/xe/if_xe.c
@@ -25,7 +25,7 @@
  *
  *	$Id: if_xe.c,v 1.20 1999/06/13 19:17:40 scott Exp $
  * $FreeBSD: src/sys/dev/xe/if_xe.c,v 1.13.2.6 2003/02/05 22:03:57 mbr Exp $
- * $DragonFly: src/sys/dev/netif/xe/if_xe.c,v 1.11 2004/06/30 12:14:39 eirikn Exp $
+ * $DragonFly: src/sys/dev/netif/xe/if_xe.c,v 1.12 2004/07/02 17:42:20 joerg Exp $
  */
 
 /*
@@ -578,9 +578,6 @@ xe_attach (device_t dev) {
     device_printf(dev, "CE2 version = %#x\n", XE_INB(XE_REV));
   }
 
-  /* Print MAC address */
-  device_printf(dev, "Ethernet address %6D\n", scp->arpcom.ac_enaddr, ":");
-
   /* Attach the interface */
   ether_ifattach(scp->ifp, scp->arpcom.ac_enaddr);
 
diff --git a/sys/dev/netif/xl/if_xl.c b/sys/dev/netif/xl/if_xl.c
index 58c5f4715d..44e768c937 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.28 2003/10/08 06:01:57 murray Exp $
- * $DragonFly: src/sys/dev/netif/xl/if_xl.c,v 1.12 2004/06/02 14:42:56 eirikn Exp $
+ * $DragonFly: src/sys/dev/netif/xl/if_xl.c,v 1.13 2004/07/02 17:42:21 joerg Exp $
  */
 
 /*
@@ -1476,11 +1476,6 @@ xl_attach(dev)
 		goto fail;
 	}
 
-	/*
-	 * A 3Com chip was detected. Inform the world.
-	 */
-	printf("xl%d: Ethernet address: %6D\n", unit, eaddr, ":");
-
 	sc->xl_unit = unit;
 	callout_handle_init(&sc->xl_stat_ch);
 
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 446e307095..8233731c70 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -32,7 +32,7 @@
  *
  *	@(#)if_ethersubr.c	8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/net/if_ethersubr.c,v 1.70.2.33 2003/04/28 15:45:53 archie Exp $
- * $DragonFly: src/sys/net/if_ethersubr.c,v 1.14 2004/06/02 14:42:57 eirikn Exp $
+ * $DragonFly: src/sys/net/if_ethersubr.c,v 1.15 2004/07/02 17:42:21 joerg Exp $
  */
 
 #include "opt_atalk.h"
@@ -840,6 +840,8 @@ ether_ifattach_bpf(struct ifnet *ifp, uint8_t *lla, u_int dlt, u_int hdrlen)
 		(*ng_ether_attach_p)(ifp);
 	if (BDG_LOADED)
 		bdgtakeifaces_ptr();
+
+	if_printf(ifp, "MAC address: %6D\n", lla, ":");
 }
 
 /*