aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew N. Dodd <mdodd@FreeBSD.org>2004-03-14 07:12:25 +0000
committerMatthew N. Dodd <mdodd@FreeBSD.org>2004-03-14 07:12:25 +0000
commite3bbbec2cab53ad77b29eb4a4400b2f4aa901929 (patch)
tree87e6b83d0a7a379f76cda0a3a657d20a73d4511f
parentf1e5dca6e0034b10f2f794201f73226408b3b14b (diff)
downloadsrc-e3bbbec2cab53ad77b29eb4a4400b2f4aa901929.tar.gz
src-e3bbbec2cab53ad77b29eb4a4400b2f4aa901929.zip
Announce ethernet MAC addresss in ether_ifattach().
Notes
Notes: svn path=/head/; revision=126966
-rw-r--r--sys/dev/an/if_an.c3
-rw-r--r--sys/dev/bfe/if_bfe.c3
-rw-r--r--sys/dev/bge/if_bge.c6
-rw-r--r--sys/dev/cnw/if_cnw.c2
-rw-r--r--sys/dev/cs/if_cs.c4
-rw-r--r--sys/dev/dc/if_dc.c5
-rw-r--r--sys/dev/de/if_de.c2
-rw-r--r--sys/dev/ed/if_ed.c5
-rw-r--r--sys/dev/ep/if_ep.c3
-rw-r--r--sys/dev/ex/if_ex.c3
-rw-r--r--sys/dev/fe/if_fe.c3
-rw-r--r--sys/dev/fxp/if_fxp.c3
-rw-r--r--sys/dev/gx/if_gx.c2
-rw-r--r--sys/dev/ie/if_ie.c3
-rw-r--r--sys/dev/lge/if_lge.c5
-rw-r--r--sys/dev/lnc/if_lnc.c6
-rw-r--r--sys/dev/my/if_my.c5
-rw-r--r--sys/dev/nge/if_nge.c5
-rw-r--r--sys/dev/owi/if_owi.c2
-rw-r--r--sys/dev/re/if_re.c5
-rw-r--r--sys/dev/sbni/if_sbni.c3
-rw-r--r--sys/dev/sf/if_sf.c6
-rw-r--r--sys/dev/sk/if_sk.c3
-rw-r--r--sys/dev/sn/if_sn.c1
-rw-r--r--sys/dev/snc/dp83932.c1
-rw-r--r--sys/dev/ti/if_ti.c6
-rw-r--r--sys/dev/tx/if_tx.c3
-rw-r--r--sys/dev/txp/if_txp.c3
-rw-r--r--sys/dev/usb/if_aue.c5
-rw-r--r--sys/dev/usb/if_axe.c5
-rw-r--r--sys/dev/usb/if_cue.c5
-rw-r--r--sys/dev/usb/if_kue.c6
-rw-r--r--sys/dev/usb/if_rue.c3
-rw-r--r--sys/dev/vr/if_vr.c5
-rw-r--r--sys/dev/vx/if_vx.c2
-rw-r--r--sys/dev/wl/if_wl.c3
-rw-r--r--sys/dev/xe/if_xe.c1
-rw-r--r--sys/i386/isa/if_el.c4
-rw-r--r--sys/i386/isa/if_le.c4
-rw-r--r--sys/i386/isa/if_rdp.c1
-rw-r--r--sys/net/if_ethersubr.c3
-rw-r--r--sys/pci/if_dc.c5
-rw-r--r--sys/pci/if_de.c2
-rw-r--r--sys/pci/if_pcn.c6
-rw-r--r--sys/pci/if_rl.c5
-rw-r--r--sys/pci/if_sf.c6
-rw-r--r--sys/pci/if_sis.c5
-rw-r--r--sys/pci/if_sk.c3
-rw-r--r--sys/pci/if_ste.c6
-rw-r--r--sys/pci/if_ti.c6
-rw-r--r--sys/pci/if_tl.c6
-rw-r--r--sys/pci/if_vr.c5
-rw-r--r--sys/pci/if_wb.c5
-rw-r--r--sys/pci/if_xl.c5
54 files changed, 12 insertions, 201 deletions
diff --git a/sys/dev/an/if_an.c b/sys/dev/an/if_an.c
index 5af543b04396..ae50861d8948 100644
--- a/sys/dev/an/if_an.c
+++ b/sys/dev/an/if_an.c
@@ -749,9 +749,6 @@ an_attach(sc, unit, flags)
bcopy((char *)&sc->an_caps.an_oemaddr,
(char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN);
- printf("an%d: Ethernet address: %6D\n", sc->an_unit,
- sc->arpcom.ac_enaddr, ":");
-
ifp->if_softc = sc;
sc->an_unit = unit;
if_initname(ifp, device_get_name(sc->an_dev),
diff --git a/sys/dev/bfe/if_bfe.c b/sys/dev/bfe/if_bfe.c
index bc989b60db7b..2ea40f5cf488 100644
--- a/sys/dev/bfe/if_bfe.c
+++ b/sys/dev/bfe/if_bfe.c
@@ -406,9 +406,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/bge/if_bge.c b/sys/dev/bge/if_bge.c
index 1df7e492cef4..bb6b454bf052 100644
--- a/sys/dev/bge/if_bge.c
+++ b/sys/dev/bge/if_bge.c
@@ -2309,12 +2309,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, ":");
-
/* Save ASIC rev. */
sc->bge_chipid =
diff --git a/sys/dev/cnw/if_cnw.c b/sys/dev/cnw/if_cnw.c
index 6aedca3a45dc..801d715e8820 100644
--- a/sys/dev/cnw/if_cnw.c
+++ b/sys/dev/cnw/if_cnw.c
@@ -1628,8 +1628,6 @@ static int cnw_pccard_attach(device_t dev)
bus_space_read_1(sc->sc_memt, sc->sc_memh,
sc->sc_memoff + CNW_EREG_PA + i);
}
- device_printf(dev, "Ethernet address: %6D\n",
- sc->arpcom.ac_enaddr, ":");
ifp->if_softc = sc;
if_initname(ifp, device_get_name(dev), device_get_unit(dev));
diff --git a/sys/dev/cs/if_cs.c b/sys/dev/cs/if_cs.c
index 44511e848c66..da8f6b1f56e0 100644
--- a/sys/dev/cs/if_cs.c
+++ b/sys/dev/cs/if_cs.c
@@ -686,10 +686,6 @@ cs_attach(device_t dev)
ether_ifattach(ifp, sc->arpcom.ac_enaddr);
- if (bootverbose)
- if_printf(ifp, "ethernet address %6D\n",
- sc->arpcom.ac_enaddr, ":");
-
return (0);
}
diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c
index ac095cdc41fb..84c301941f61 100644
--- a/sys/dev/dc/if_dc.c
+++ b/sys/dev/dc/if_dc.c
@@ -2152,11 +2152,6 @@ dc_attach(device_t 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;
bcopy(eaddr, &sc->arpcom.ac_enaddr, ETHER_ADDR_LEN);
diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index b1ea3c41b8d2..c8a4da675d0f 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -4784,8 +4784,10 @@ tulip_attach(
sc->tulip_revinfo & 0x0F,
(sc->tulip_features & (TULIP_HAVE_ISVSROM|TULIP_HAVE_OKSROM))
== TULIP_HAVE_ISVSROM ? " (invalid EESPROM checksum)" : "");
+#ifndef __FreeBSD__
printf("%s: address %6D\n",
sc->tulip_xname, sc->tulip_enaddr, ":");
+#endif
#if defined(__alpha__)
/*
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 10bd774c3559..43d8c5ed8f46 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -1758,11 +1758,6 @@ ed_attach(dev)
ether_ifattach(ifp, sc->arpcom.ac_enaddr);
/* 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/ep/if_ep.c b/sys/dev/ep/if_ep.c
index fb64844ab230..4f25457de8a2 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -287,9 +287,6 @@ ep_attach(struct ep_softc *sc)
for (i = 0; i < 3; i++)
CSR_WRITE_2(sc, 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/ex/if_ex.c b/sys/dev/ex/if_ex.c
index b4b1bc3a2611..02dcd6281999 100644
--- a/sys/dev/ex/if_ex.c
+++ b/sys/dev/ex/if_ex.c
@@ -271,9 +271,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/fe/if_fe.c b/sys/dev/fe/if_fe.c
index e47fcae85273..c806167a8ae6 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/if_fe.c
@@ -821,8 +821,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/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c
index 39a42d0f0607..d35e7347f700 100644
--- a/sys/dev/fxp/if_fxp.c
+++ b/sys/dev/fxp/if_fxp.c
@@ -758,9 +758,6 @@ fxp_attach(device_t dev)
sc->arpcom.ac_enaddr[3] = myea[1] >> 8;
sc->arpcom.ac_enaddr[4] = myea[2] & 0xff;
sc->arpcom.ac_enaddr[5] = myea[2] >> 8;
- device_printf(dev, "Ethernet address %6D%s\n",
- sc->arpcom.ac_enaddr, ":",
- sc->flags & FXP_FLAG_SERIAL_MEDIA ? ", 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/gx/if_gx.c b/sys/dev/gx/if_gx.c
index 4c29d1ea948f..dc5a01c74195 100644
--- a/sys/dev/gx/if_gx.c
+++ b/sys/dev/gx/if_gx.c
@@ -320,8 +320,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/ie/if_ie.c b/sys/dev/ie/if_ie.c
index 425173853e8b..b1f66ab70161 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -319,9 +319,6 @@ ie_attach(device_t dev)
EVENTHANDLER_REGISTER(shutdown_post_sync, ee16_shutdown,
sc, SHUTDOWN_PRI_DEFAULT);
- device_printf(sc->dev, "Ethernet address %6D\n",
- sc->arpcom.ac_enaddr, ":");
-
ether_ifattach(ifp, sc->arpcom.ac_enaddr);
return (0);
}
diff --git a/sys/dev/lge/if_lge.c b/sys/dev/lge/if_lge.c
index e9fd5e604578..1e2385d90357 100644
--- a/sys/dev/lge/if_lge.c
+++ b/sys/dev/lge/if_lge.c
@@ -572,11 +572,6 @@ 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);
bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN);
diff --git a/sys/dev/lnc/if_lnc.c b/sys/dev/lnc/if_lnc.c
index 35b47bcc931b..52b54123b177 100644
--- a/sys/dev/lnc/if_lnc.c
+++ b/sys/dev/lnc/if_lnc.c
@@ -894,13 +894,11 @@ lnc_attach_common(device_t dev)
ether_ifattach(&sc->arpcom.ac_if, sc->arpcom.ac_enaddr);
- printf("%s: ", sc->arpcom.ac_if.if_xname);
if (sc->nic.ic == LANCE || sc->nic.ic == C_LANCE)
- printf("%s (%s)",
+ if_printf(&sc->arpcom.ac_if, "%s (%s)\n",
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(&sc->arpcom.ac_if, "%s\n", ic_ident[sc->nic.ic]);
return (1);
}
diff --git a/sys/dev/my/if_my.c b/sys/dev/my/if_my.c
index 30137afd6e25..9ad5371f44d4 100644
--- a/sys/dev/my/if_my.c
+++ b/sys/dev/my/if_my.c
@@ -961,11 +961,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;
bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN);
diff --git a/sys/dev/nge/if_nge.c b/sys/dev/nge/if_nge.c
index c141cd8065df..1d9e105aa467 100644
--- a/sys/dev/nge/if_nge.c
+++ b/sys/dev/nge/if_nge.c
@@ -906,11 +906,6 @@ 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;
bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN);
diff --git a/sys/dev/owi/if_owi.c b/sys/dev/owi/if_owi.c
index 456ddfff37c7..918370bd9b40 100644
--- a/sys/dev/owi/if_owi.c
+++ b/sys/dev/owi/if_owi.c
@@ -226,8 +226,6 @@ owi_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, ":");
-
owi_get_id(sc);
if_initname(ifp, device_get_name(dev), sc->wi_unit);
diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c
index 77157bc6361a..28e6108c03f2 100644
--- a/sys/dev/re/if_re.c
+++ b/sys/dev/re/if_re.c
@@ -1212,11 +1212,6 @@ re_attach(dev)
}
}
- /*
- * A RealTek chip was detected. Inform the world.
- */
- printf("re%d: Ethernet address: %6D\n", unit, eaddr, ":");
-
sc->rl_unit = unit;
bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN);
diff --git a/sys/dev/sbni/if_sbni.c b/sys/dev/sbni/if_sbni.c
index dad1dce437ad..e4cacf2fd7ec 100644
--- a/sys/dev/sbni/if_sbni.c
+++ b/sys/dev/sbni/if_sbni.c
@@ -245,8 +245,7 @@ sbni_attach(struct sbni_softc *sc, int unit, struct sbni_flags flags)
ether_ifattach(ifp, sc->arpcom.ac_enaddr);
/* device attach does transition from UNCONFIGURED to IDLE state */
- if_printf(ifp, "speed %ld, address %6D, rxl ",
- 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/sf/if_sf.c b/sys/dev/sf/if_sf.c
index 3bb3b40652e0..980c5777e34b 100644
--- a/sys/dev/sf/if_sf.c
+++ b/sys/dev/sf/if_sf.c
@@ -737,12 +737,6 @@ 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/sk/if_sk.c b/sys/dev/sk/if_sk.c
index 67297913ccc4..deb02c1a6efa 100644
--- a/sys/dev/sk/if_sk.c
+++ b/sys/dev/sk/if_sk.c
@@ -1382,9 +1382,6 @@ 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/sn/if_sn.c b/sys/dev/sn/if_sn.c
index adf24878857a..678a2e8efb90 100644
--- a/sys/dev/sn/if_sn.c
+++ b/sys/dev/sn/if_sn.c
@@ -201,7 +201,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, device_get_name(dev), device_get_unit(dev));
ifp->if_mtu = ETHERMTU;
diff --git a/sys/dev/snc/dp83932.c b/sys/dev/snc/dp83932.c
index 5b59e293def6..544557614d6b 100644
--- a/sys/dev/snc/dp83932.c
+++ b/sys/dev/snc/dp83932.c
@@ -162,7 +162,6 @@ sncconfig(sc, media, nmedia, defmedia, myea)
camdump(sc);
}
#endif
- device_printf(sc->sc_dev, "address %6D\n", myea, ":");
#ifdef SNCDEBUG
device_printf(sc->sc_dev,
diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c
index d126ef41b65f..46f64aead45c 100644
--- a/sys/dev/ti/if_ti.c
+++ b/sys/dev/ti/if_ti.c
@@ -2122,12 +2122,6 @@ 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/tx/if_tx.c b/sys/dev/tx/if_tx.c
index 6a6f3c88de72..b9933b22c435 100644
--- a/sys/dev/tx/if_tx.c
+++ b/sys/dev/tx/if_tx.c
@@ -391,9 +391,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/txp/if_txp.c b/sys/dev/txp/if_txp.c
index d5161ea07f96..23b91c046f61 100644
--- a/sys/dev/txp/if_txp.c
+++ b/sys/dev/txp/if_txp.c
@@ -334,9 +334,6 @@ txp_attach(dev)
sc->sc_arpcom.ac_enaddr[4] = ((u_int8_t *)&p2)[1];
sc->sc_arpcom.ac_enaddr[5] = ((u_int8_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/usb/if_aue.c b/sys/dev/usb/if_aue.c
index 8046bff4343b..cd8c3e61fe99 100644
--- a/sys/dev/usb/if_aue.c
+++ b/sys/dev/usb/if_aue.c
@@ -730,11 +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;
diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c
index 4ad6698c02b3..caea948f7365 100644
--- a/sys/dev/usb/if_axe.c
+++ b/sys/dev/usb/if_axe.c
@@ -492,11 +492,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;
diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c
index e4b5ce840462..4ffccea0fa72 100644
--- a/sys/dev/usb/if_cue.c
+++ b/sys/dev/usb/if_cue.c
@@ -510,11 +510,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;
diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c
index 1f715500d1bb..7050ae831ad8 100644
--- a/sys/dev/usb/if_kue.c
+++ b/sys/dev/usb/if_kue.c
@@ -475,12 +475,6 @@ USB_ATTACH(kue)
sc->kue_mcfilters = malloc(KUE_MCFILTCNT(sc) * ETHER_ADDR_LEN,
M_USBDEV, M_NOWAIT);
- /*
- * 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);
diff --git a/sys/dev/usb/if_rue.c b/sys/dev/usb/if_rue.c
index 3707a366bf5c..d0bda30d6e15 100644
--- a/sys/dev/usb/if_rue.c
+++ b/sys/dev/usb/if_rue.c
@@ -682,9 +682,6 @@ USB_ATTACH(rue)
goto error1;
}
- /* RealTek RTL8150 was detected */
- printf("rue%d: Ethernet address: %6D\n", sc->rue_unit, eaddr, ":");
-
bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN);
ifp = &sc->arpcom.ac_if;
diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c
index 94d42852b3b9..72d1b1b669dd 100644
--- a/sys/dev/vr/if_vr.c
+++ b/sys/dev/vr/if_vr.c
@@ -826,11 +826,6 @@ 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;
bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN);
diff --git a/sys/dev/vx/if_vx.c b/sys/dev/vx/if_vx.c
index 5f17e2274f78..c36d3bf3ef0d 100644
--- a/sys/dev/vx/if_vx.c
+++ b/sys/dev/vx/if_vx.c
@@ -155,8 +155,6 @@ vxattach(dev)
sc->arpcom.ac_enaddr[(i << 1) + 1] = x;
}
- printf(" address %6D\n", sc->arpcom.ac_enaddr, ":");
-
if_initname(ifp, device_get_name(dev), device_get_unit(dev));
ifp->if_mtu = ETHERMTU;
ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c
index 465a49063cea..c9ec34abbb08 100644
--- a/sys/dev/wl/if_wl.c
+++ b/sys/dev/wl/if_wl.c
@@ -569,8 +569,7 @@ wlattach(device_t device)
ether_ifattach(ifp, &sc->wl_addr[0]);
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/xe/if_xe.c b/sys/dev/xe/if_xe.c
index 169c9f85d9e1..fe8e579f933c 100644
--- a/sys/dev/xe/if_xe.c
+++ b/sys/dev/xe/if_xe.c
@@ -297,7 +297,6 @@ xe_attach (device_t dev)
XE_SELECT_PAGE(0x45);
DEVPRINTF(1, (dev, "CE2 version = 0x%#02x\n", XE_INB(XE_REV)));
}
- 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/i386/isa/if_el.c b/sys/i386/isa/if_el.c
index 62dd35d0116d..7486374eb1c2 100644
--- a/sys/i386/isa/if_el.c
+++ b/sys/i386/isa/if_el.c
@@ -277,10 +277,6 @@ el_attach(device_t dev)
dprintf(("Attaching interface...\n"));
ether_ifattach(ifp, sc->arpcom.ac_enaddr);
- /* Print out some information for the user */
- device_printf(dev, "3c501 address %6D\n",
- sc->arpcom.ac_enaddr, ":");
-
dprintf(("el_attach() finished.\n"));
return(0);
}
diff --git a/sys/i386/isa/if_le.c b/sys/i386/isa/if_le.c
index 1d5ab76e8647..861c7c23d585 100644
--- a/sys/i386/isa/if_le.c
+++ b/sys/i386/isa/if_le.c
@@ -352,10 +352,6 @@ le_attach(
ifp->if_init = sc->if_init;
ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
- if_printf(ifp, "%s ethernet address %6D\n",
- sc->le_prodname,
- sc->le_ac.ac_enaddr, ":");
-
ether_ifattach(ifp, sc->le_ac.ac_enaddr);
return 1;
diff --git a/sys/i386/isa/if_rdp.c b/sys/i386/isa/if_rdp.c
index 80d29428d73d..a396bdd69eea 100644
--- a/sys/i386/isa/if_rdp.c
+++ b/sys/i386/isa/if_rdp.c
@@ -615,7 +615,6 @@ rdp_attach(struct isa_device *isa_dev)
"8002", /* hook for 8012 */
sc->eeprom == EEPROM_93C46? "93C46": "74S288",
sc->slow? "slow": "fast");
- if_printf(ifp, "address %6D\n", sc->arpcom.ac_enaddr, ":");
return 1;
}
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 16d8f5206d8a..4f7ac0fb3787 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -868,6 +868,9 @@ ether_ifattach(struct ifnet *ifp, const u_int8_t *llc)
(*ng_ether_attach_p)(ifp);
if (BDG_LOADED)
bdgtakeifaces_ptr();
+
+ /* Announce Ethernet MAC address. */
+ if_printf(ifp, "Ethernet address: %6D\n", llc, ":");
}
/*
diff --git a/sys/pci/if_dc.c b/sys/pci/if_dc.c
index ac095cdc41fb..84c301941f61 100644
--- a/sys/pci/if_dc.c
+++ b/sys/pci/if_dc.c
@@ -2152,11 +2152,6 @@ dc_attach(device_t 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;
bcopy(eaddr, &sc->arpcom.ac_enaddr, ETHER_ADDR_LEN);
diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index b1ea3c41b8d2..c8a4da675d0f 100644
--- a/sys/pci/if_de.c
+++ b/sys/pci/if_de.c
@@ -4784,8 +4784,10 @@ tulip_attach(
sc->tulip_revinfo & 0x0F,
(sc->tulip_features & (TULIP_HAVE_ISVSROM|TULIP_HAVE_OKSROM))
== TULIP_HAVE_ISVSROM ? " (invalid EESPROM checksum)" : "");
+#ifndef __FreeBSD__
printf("%s: address %6D\n",
sc->tulip_xname, sc->tulip_enaddr, ":");
+#endif
#if defined(__alpha__)
/*
diff --git a/sys/pci/if_pcn.c b/sys/pci/if_pcn.c
index 679dbbe2e966..95b6d93889b8 100644
--- a/sys/pci/if_pcn.c
+++ b/sys/pci/if_pcn.c
@@ -580,12 +580,6 @@ pcn_attach(dev)
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);
diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c
index 1c4d98af1028..b5299f4ba079 100644
--- a/sys/pci/if_rl.c
+++ b/sys/pci/if_rl.c
@@ -999,11 +999,6 @@ rl_attach(dev)
eaddr[(i * 2) + 1] = as[i] >> 8;
}
- /*
- * A RealTek chip was detected. Inform the world.
- */
- printf("rl%d: Ethernet address: %6D\n", unit, eaddr, ":");
-
sc->rl_unit = unit;
bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN);
diff --git a/sys/pci/if_sf.c b/sys/pci/if_sf.c
index 3bb3b40652e0..980c5777e34b 100644
--- a/sys/pci/if_sf.c
+++ b/sys/pci/if_sf.c
@@ -737,12 +737,6 @@ 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/pci/if_sis.c b/sys/pci/if_sis.c
index 2d8a5299f3e6..bae9905b26b5 100644
--- a/sys/pci/if_sis.c
+++ b/sys/pci/if_sis.c
@@ -1234,11 +1234,6 @@ sis_attach(dev)
break;
}
- /*
- * A SiS chip was detected. Inform the world.
- */
- printf("sis%d: Ethernet address: %6D\n", unit, eaddr, ":");
-
sc->sis_unit = unit;
callout_init(&sc->sis_stat_ch, CALLOUT_MPSAFE);
bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN);
diff --git a/sys/pci/if_sk.c b/sys/pci/if_sk.c
index 67297913ccc4..deb02c1a6efa 100644
--- a/sys/pci/if_sk.c
+++ b/sys/pci/if_sk.c
@@ -1382,9 +1382,6 @@ 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/pci/if_ste.c b/sys/pci/if_ste.c
index 8d25e211ca5c..ebaa0bf91c37 100644
--- a/sys/pci/if_ste.c
+++ b/sys/pci/if_ste.c
@@ -1001,12 +1001,6 @@ 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/pci/if_ti.c b/sys/pci/if_ti.c
index d126ef41b65f..46f64aead45c 100644
--- a/sys/pci/if_ti.c
+++ b/sys/pci/if_ti.c
@@ -2122,12 +2122,6 @@ 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/pci/if_tl.c b/sys/pci/if_tl.c
index f6fcd4cea78d..4188beff86fd 100644
--- a/sys/pci/if_tl.c
+++ b/sys/pci/if_tl.c
@@ -1258,12 +1258,6 @@ tl_attach(dev)
}
}
- /*
- * A ThunderLAN chip was detected. Inform the world.
- */
- device_printf(dev, "Ethernet address: %6D\n",
- sc->arpcom.ac_enaddr, ":");
-
ifp = &sc->arpcom.ac_if;
ifp->if_softc = sc;
if_initname(ifp, device_get_name(dev), device_get_unit(dev));
diff --git a/sys/pci/if_vr.c b/sys/pci/if_vr.c
index 94d42852b3b9..72d1b1b669dd 100644
--- a/sys/pci/if_vr.c
+++ b/sys/pci/if_vr.c
@@ -826,11 +826,6 @@ 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;
bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN);
diff --git a/sys/pci/if_wb.c b/sys/pci/if_wb.c
index 063e4b5d49ec..372c205f3d87 100644
--- a/sys/pci/if_wb.c
+++ b/sys/pci/if_wb.c
@@ -892,11 +892,6 @@ 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;
bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN);
diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c
index 3076260d3143..939cd20a4a63 100644
--- a/sys/pci/if_xl.c
+++ b/sys/pci/if_xl.c
@@ -1480,11 +1480,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);
bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN);