summaryrefslogtreecommitdiffstats
path: root/sys/pci
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2005-12-22 16:18:23 +0000
committerjhb <jhb@FreeBSD.org>2005-12-22 16:18:23 +0000
commitfec7bec361c81077222b0f0d380d1c918ccffd81 (patch)
tree6e8a75c6655b826911cfea06c5ce01e9285c6c0f /sys/pci
parent0d52df814ab847e4d6813236e66464178386e849 (diff)
downloadFreeBSD-src-fec7bec361c81077222b0f0d380d1c918ccffd81.zip
FreeBSD-src-fec7bec361c81077222b0f0d380d1c918ccffd81.tar.gz
Use the copy of the card's MAC address saved in tulip_enaddr() in the softc
if we need a valid MAC address (for probing the media for example) before ether_ifattach() has been called since IF_LLADDR() is NULL then. Tested by: tisco
Diffstat (limited to 'sys/pci')
-rw-r--r--sys/pci/if_de.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index 3ad22d3..e3a5347 100644
--- a/sys/pci/if_de.c
+++ b/sys/pci/if_de.c
@@ -246,6 +246,8 @@ static int
tulip_txprobe(tulip_softc_t * const sc)
{
struct mbuf *m;
+ u_char *enaddr;
+
/*
* Before we are sure this is the right media we need
* to send a small packet to make sure there's carrier.
@@ -260,8 +262,12 @@ tulip_txprobe(tulip_softc_t * const sc)
/*
* Construct a LLC TEST message which will point to ourselves.
*/
- bcopy(IF_LLADDR(sc->tulip_ifp), mtod(m, struct ether_header *)->ether_dhost, 6);
- bcopy(IF_LLADDR(sc->tulip_ifp), mtod(m, struct ether_header *)->ether_shost, 6);
+ if (sc->tulip_ifp->if_input != NULL)
+ enaddr = IF_LLADDR(sc->tulip_ifp);
+ else
+ enaddr = sc->tulip_enaddr;
+ bcopy(enaddr, mtod(m, struct ether_header *)->ether_dhost, ETHER_ADDR_LEN);
+ bcopy(enaddr, mtod(m, struct ether_header *)->ether_shost, ETHER_ADDR_LEN);
mtod(m, struct ether_header *)->ether_type = htons(3);
mtod(m, unsigned char *)[14] = 0;
mtod(m, unsigned char *)[15] = 0;
@@ -3041,7 +3047,10 @@ tulip_addr_filter(tulip_softc_t * const sc)
IF_ADDR_LOCK(ifp);
/* Copy MAC address on stack to align. */
- bcopy(IF_LLADDR(ifp), eaddr, ETHER_ADDR_LEN);
+ if (ifp->if_input != NULL)
+ bcopy(IF_LLADDR(ifp), eaddr, ETHER_ADDR_LEN);
+ else
+ bcopy(sc->tulip_enaddr, eaddr, ETHER_ADDR_LEN);
TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
OpenPOWER on IntegriCloud