diff options
| author | Jason Wright <jason@cvs.openbsd.org> | 2006-12-21 22:13:37 +0000 |
|---|---|---|
| committer | Jason Wright <jason@cvs.openbsd.org> | 2006-12-21 22:13:37 +0000 |
| commit | a9b75613598b7598cdd246ff29cc624b6651760a (patch) | |
| tree | 6abd88076b46880c8e8b6725ab6b518d623326ba /sys/dev/pci | |
| parent | dbba99d219fa4a10f2796265a34120aff635f6de (diff) | |
betetr yet, just nuke sc_enaddr all together, just fill in arpcom and
everybody is happy
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/if_gem_pci.c | 10 | ||||
| -rw-r--r-- | sys/dev/pci/if_hme_pci.c | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/sys/dev/pci/if_gem_pci.c b/sys/dev/pci/if_gem_pci.c index f228717ddab..4484a8fe05c 100644 --- a/sys/dev/pci/if_gem_pci.c +++ b/sys/dev/pci/if_gem_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_gem_pci.c,v 1.26 2006/11/25 17:47:40 brad Exp $ */ +/* $OpenBSD: if_gem_pci.c,v 1.27 2006/12/21 22:13:36 jason Exp $ */ /* $NetBSD: if_gem_pci.c,v 1.1 2001/09/16 00:11:42 eeh Exp $ */ /* @@ -186,7 +186,7 @@ gem_pci_enaddr(struct gem_softc *sc, struct pci_attach_args *pa) if (vpd->vpd_key0 != 'N' || vpd->vpd_key1 != 'A') goto fail; - bcopy(buf + 6, sc->sc_enaddr, ETHER_ADDR_LEN); + bcopy(buf + 6, sc->sc_arpcom.ac_enaddr, ETHER_ADDR_LEN); rv = 0; fail: @@ -267,14 +267,14 @@ gem_attach_pci(struct device *parent, struct device *self, void *aux) #ifdef __sparc64__ if (!gotenaddr) { if (OF_getprop(PCITAG_NODE(pa->pa_tag), "local-mac-address", - sc->sc_enaddr, ETHER_ADDR_LEN) <= 0) - myetheraddr(sc->sc_enaddr); + sc->sc_arpcom.ac_enaddr, ETHER_ADDR_LEN) <= 0) + myetheraddr(sc->sc_arpcom.ac_enaddr); gotenaddr = 1; } #endif #ifdef __powerpc__ if (!gotenaddr) { - pci_ether_hw_addr(pa->pa_pc, sc->sc_enaddr); + pci_ether_hw_addr(pa->pa_pc, sc->sc_arpcom.ac_enaddr); gotenaddr = 1; } #endif diff --git a/sys/dev/pci/if_hme_pci.c b/sys/dev/pci/if_hme_pci.c index 2ab3bd8cff3..079111ec44c 100644 --- a/sys/dev/pci/if_hme_pci.c +++ b/sys/dev/pci/if_hme_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_hme_pci.c,v 1.11 2006/10/15 14:46:13 kettenis Exp $ */ +/* $OpenBSD: if_hme_pci.c,v 1.12 2006/12/21 22:13:36 jason Exp $ */ /* $NetBSD: if_hme_pci.c,v 1.3 2000/12/28 22:59:13 sommerfeld Exp $ */ /* @@ -182,8 +182,8 @@ hme_pci_enaddr(struct hme_softc *sc, struct pci_attach_args *hpa) if (vpd->vpd_key0 != 'N' || vpd->vpd_key1 != 'A') goto fail; - bcopy(buf + 6, sc->sc_enaddr, ETHER_ADDR_LEN); - sc->sc_enaddr[5] += hpa->pa_device; + bcopy(buf + 6, sc->sc_arpcom.ac_enaddr, ETHER_ADDR_LEN); + sc->sc_arpcom.ac_enaddr[5] += hpa->pa_device; bus_space_unmap(romt, romh, romsize); return (0); @@ -266,14 +266,14 @@ hmeattach_pci(parent, self, aux) #ifdef __sparc64__ if (!gotenaddr) { if (OF_getprop(PCITAG_NODE(pa->pa_tag), "local-mac-address", - sc->sc_enaddr, ETHER_ADDR_LEN) <= 0) - myetheraddr(sc->sc_enaddr); + sc->sc_arpcom.ac_enaddr, ETHER_ADDR_LEN) <= 0) + myetheraddr(sc->sc_arpcom.ac_enaddr); gotenaddr = 1; } #endif #ifdef __powerpc__ if (!gotenaddr) { - pci_ether_hw_addr(pa->pa_pc, sc->sc_enaddr); + pci_ether_hw_addr(pa->pa_pc, sc->sc_arpcom.ac_enaddr); gotenaddr = 1; } #endif |