Don't announce MAC addresses twice.

(ieee80211_ifattach() calls ether_ifattach().)

4 files changed, 0 insertions, 11 deletions

diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c
index 378fedf..3597c52 100644
--- a/sys/dev/ath/if_ath.c
+++ b/sys/dev/ath/if_ath.c
@@ -349,8 +349,6 @@ ath_attach(u_int16_t devid, struct ath_softc *sc)
 	sc->sc_rx_th.wr_ihdr.it_len = sizeof(sc->sc_rx_th);
 	sc->sc_rx_th.wr_ihdr.it_present = ATH_RX_RADIOTAP_PRESENT;
 
-	if_printf(ifp, "802.11 address: %s\n", ether_sprintf(ic->ic_myaddr));
-
 	return 0;
 bad:
 	if (ah)
diff --git a/sys/dev/awi/awi.c b/sys/dev/awi/awi.c
index ded14a3..eec1d30 100644
--- a/sys/dev/awi/awi.c
+++ b/sys/dev/awi/awi.c
@@ -316,8 +316,6 @@ awi_attach(struct awi_softc *sc)
 
 	printf("%s: IEEE802.11 %s (firmware %s)\n", ifp->if_xname,
 	    (ic->ic_phytype == IEEE80211_T_FH) ? "FH" : "DS", sc->sc_banner);
-	printf("%s: 802.11 address: %s\n", ifp->if_xname,
-	    ether_sprintf(ic->ic_myaddr));
 
 #ifdef __NetBSD__
 	if_attach(ifp);
diff --git a/sys/dev/if_ndis/if_ndis.c b/sys/dev/if_ndis/if_ndis.c
index 490eb75..75303ef 100644
--- a/sys/dev/if_ndis/if_ndis.c
+++ b/sys/dev/if_ndis/if_ndis.c
@@ -476,12 +476,6 @@ ndis_attach(dev)
 	/* Check for task offload support. */
 	ndis_probe_offload(sc);
 
-	/*
-	 * An NDIS device was detected. Inform the world.
-	 */
-	device_printf(dev, "%s address: %6D\n",
-	    sc->ndis_80211 ? "802.11" : "Ethernet", eaddr, ":");
-
 	ifp = &sc->arpcom.ac_if;
 	ifp->if_softc = sc;
 	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
diff --git a/sys/dev/wi/if_wi.c b/sys/dev/wi/if_wi.c
index d26577f..c036199 100644
--- a/sys/dev/wi/if_wi.c
+++ b/sys/dev/wi/if_wi.c
@@ -295,7 +295,6 @@ wi_attach(device_t dev)
 		wi_free(dev);
 		return (error);
 	}
-	device_printf(dev, "802.11 address: %6D\n", ic->ic_myaddr, ":");
 
 	/* Read NIC identification */
 	wi_read_nicid(sc);