Announce ethernet MAC addresss in ether_ifattach().

This commit is contained in:
Matthew N. Dodd 2004-03-14 07:12:25 +00:00
parent f1e5dca6e0
commit e3bbbec2ca
54 changed files with 12 additions and 201 deletions

View File

@ -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),

View File

@ -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);

View File

@ -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 =

View File

@ -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));

View File

@ -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);
}

View File

@ -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);

View File

@ -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__)
/*

View File

@ -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

View File

@ -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);

View File

@ -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);
}

View File

@ -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;

View File

@ -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),

View File

@ -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,

View File

@ -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);
}

View File

@ -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);

View File

@ -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);
}

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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

View File

@ -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. */

View File

@ -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

View File

@ -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;

View File

@ -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,

View File

@ -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);

View File

@ -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++) {

View File

@ -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);

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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);

View File

@ -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;

View File

@ -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);

View File

@ -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;

View File

@ -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 */

View File

@ -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);

View File

@ -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);
}

View File

@ -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;

View File

@ -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;
}

View File

@ -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, ":");
}
/*

View File

@ -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);

View File

@ -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__)
/*

View File

@ -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);

View File

@ -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);

View File

@ -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. */

View File

@ -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);

View File

@ -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

View File

@ -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. */

View File

@ -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);

View File

@ -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));

View File

@ -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);

View File

@ -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);

View File

@ -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);