6 files changed, 23 insertions, 23 deletions

diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index 074893a6006e5..bf636198c5508 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_de.c,v 1.40 1995/12/14 09:53:58 phk Exp $
+ * $Id: if_de.c,v 1.41 1996/01/23 21:47:00 se Exp $
  *
  */
 
@@ -2002,12 +2002,12 @@ tulip_attach(
 #ifdef __FreeBSD__
     printf("%s%d", sc->tulip_name, sc->tulip_unit);
 #endif
-    printf(": %s%s pass %d.%d Ethernet address %s\n", 
+    printf(": %s%s pass %d.%d Ethernet address %6D\n", 
 	   sc->tulip_boardsw->bd_description,
 	   tulip_chipdescs[sc->tulip_chipid],
 	   (sc->tulip_revinfo & 0xF0) >> 4,
 	   sc->tulip_revinfo & 0x0F,
-	   ether_sprintf(sc->tulip_hwaddr));
+	   sc->tulip_hwaddr, ":");
 
     if ((*sc->tulip_boardsw->bd_media_probe)(sc)) {
 	ifp->if_flags |= IFF_ALTPHYS;
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index c5016f352c5fc..e57334c39c831 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -38,7 +38,7 @@
  */
 
 /*
- *  $Id: if_ep.c,v 1.36 1995/12/10 13:38:41 phk Exp $
+ *  $Id: if_ep.c,v 1.37 1995/12/15 00:54:11 bde Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -408,7 +408,7 @@ epattach(is)
 	GO_WINDOW(2);
 	outw(BASE + EP_W2_ADDR_0 + (i * 2), ntohs(p[i]));
     }
-    printf(" address %s", ether_sprintf(sc->arpcom.ac_enaddr));
+    printf(" address %6D", sc->arpcom.ac_enaddr, ":");
 
     /*
      * Write IRQ value to board
diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c
index 1a3b2b60bc548..5e141c52f539b 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/if_fe.c
@@ -1125,8 +1125,8 @@ fe_attach ( struct isa_device *isa_dev )
 	fe_setlinkaddr( sc );
 
 	/* Print additional info when attached.  */
-	printf( "fe%d: address %s, type %s\n", sc->sc_unit,
-		ether_sprintf( sc->sc_enaddr ), sc->typestr );
+	printf( "fe%d: address %6D, type %s\n", sc->sc_unit,
+		sc->sc_enaddr, ":" , sc->typestr );
 #if FE_DEBUG >= 3
 	{
 		int buf, txb, bbw, sbw, ram;
@@ -1301,8 +1301,8 @@ fe_init ( int unit )
 	  || ( sc->sc_enaddr[ 0 ] == 0x00
 	    && sc->sc_enaddr[ 1 ] == 0x00
 	    && sc->sc_enaddr[ 2 ] == 0x00 ) ) {
-		log( LOG_ERR, "fe%d: invalid station address (%s)\n",
-			sc->sc_unit, ether_sprintf( sc->sc_enaddr ) );
+		log( LOG_ERR, "fe%d: invalid station address (%6D)\n",
+			sc->sc_unit, sc->sc_enaddr, ":" );
 		return;
 	}
 #endif
@@ -2314,9 +2314,9 @@ fe_get_packet ( struct fe_softc * sc, u_short len )
 		 * We found an error (of this driver.)
 		 */
 		log( LOG_WARNING,
-			"fe%d: got an unwanted packet, dst = %s\n",
+			"fe%d: got an unwanted packet, dst = %6D\n",
 			sc->sc_unit,
-			ether_sprintf( eh->ether_dhost ) );
+			eh->ether_dhost , ":" );
 		m_freem( m );
 		return 0;
 	}
@@ -2526,8 +2526,8 @@ fe_mcaf ( struct fe_softc *sc )
 		}
 		index = fe_hash( enm->enm_addrlo );
 #if FE_DEBUG >= 4
-		log( LOG_INFO, "fe%d: hash(%s) == %d\n",
-			sc->sc_unit, ether_sprintf( enm->enm_addrlo ), index );
+		log( LOG_INFO, "fe%d: hash(%6D) == %d\n",
+			sc->sc_unit, enm->enm_addrlo , ":", index );
 #endif
 
 		filter.data[index >> 3] |= 1 << (index & 7);
diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c
index ddafbef646a45..1fdf77d98943f 100644
--- a/sys/dev/fxp/if_fxp.c
+++ b/sys/dev/fxp/if_fxp.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_fxp.c,v 1.8 1996/01/15 10:12:41 davidg Exp $
+ *	$Id: if_fxp.c,v 1.9 1996/01/23 21:47:03 se Exp $
  */
 
 /*
@@ -290,8 +290,8 @@ fxp_attach(config_id, unit)
 	ifp->if_watchdog = fxp_watchdog;
 
 	fxp_get_macaddr(sc);
-	printf("fxp%d: Ethernet address %s\n", unit,
-	    ether_sprintf(sc->arpcom.ac_enaddr));
+	printf("fxp%d: Ethernet address %6D\n", unit,
+	    sc->arpcom.ac_enaddr, ":");
 
 	/*
 	 * Attach the interface.
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index b825f70bc219b..4094ef22f73ef 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -43,7 +43,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ie.c,v 1.30 1995/12/05 02:01:08 davidg Exp $
+ *	$Id: if_ie.c,v 1.31 1995/12/10 13:38:45 phk Exp $
  */
 
 /*
@@ -582,10 +582,10 @@ ieattach(dvp)
   ifp->if_unit = unit;
   ifp->if_name = iedriver.name;
   ifp->if_mtu = ETHERMTU;
-  printf(" <%s R%d> ethernet address %s\n",
+  printf(" <%s R%d> ethernet address %6D\n",
 	 ie_hardware_names[ie_softc[unit].hard_type],
 	 ie_softc[unit].hard_vers + 1,
-	 ether_sprintf(ie->arpcom.ac_enaddr));
+	 ie->arpcom.ac_enaddr, ":");
 
   ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
   ifp->if_output = ether_output;
@@ -1190,8 +1190,8 @@ static void ie_readframe(unit, ie, num)
 
 #ifdef DEBUG
   if(ie_debug & IED_READFRAME) {
-    printf("ie%d: frame from ether %s type %x\n", unit,
-	   ether_sprintf(eh.ether_shost), (unsigned)eh.ether_type);
+    printf("ie%d: frame from ether %6D type %x\n", unit,
+	   eh.ether_shost, ":", (unsigned)eh.ether_type);
   }
   if(ntohs(eh.ether_type) > ETHERTYPE_TRAIL
      && ntohs(eh.ether_type) < (ETHERTYPE_TRAIL + ETHERTYPE_NTRAILER))
diff --git a/sys/dev/lnc/if_lnc.c b/sys/dev/lnc/if_lnc.c
index 358c12b5b0a22..aa5cd56032643 100644
--- a/sys/dev/lnc/if_lnc.c
+++ b/sys/dev/lnc/if_lnc.c
@@ -1182,10 +1182,10 @@ lnc_attach(struct isa_device * isa_dev)
 	if_attach(&sc->arpcom.ac_if);
 	sc->kdc.kdc_state = DC_IDLE;
 
-	printf("lnc%d: %s, address %s\n",
+	printf("lnc%d: %s, address %6D\n",
 	       isa_dev->id_unit,
 		   sc->kdc.kdc_description,
-	       ether_sprintf(sc->arpcom.ac_enaddr));
+	       sc->arpcom.ac_enaddr, ":");
 
 #if NBPFILTER > 0
 	bpfattach(&sc->bpf, &sc->arpcom.ac_if, DLT_EN10MB, sizeof(struct ether_header));