diff options
| author | imp <imp@FreeBSD.org> | 2002-11-27 07:04:10 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2002-11-27 07:04:10 +0000 |
| commit | fcbaf77e93a6186214ff9a2dad72735f44c6599e (patch) | |
| tree | 9a772503fa7ca5f10363710021c5b4a5fd4f6e6d /sys/dev/dc | |
| parent | 7fba790820da57f694d05dd3433422165bcc78e5 (diff) | |
| download | FreeBSD-src-fcbaf77e93a6186214ff9a2dad72735f44c6599e.zip FreeBSD-src-fcbaf77e93a6186214ff9a2dad72735f44c6599e.tar.gz | |
Xircom cards store the MAC address in the CIS, so get it from the new
pci_get_ether accesor, which gets it from the CIS for cardbus cards
(and from other pci-like buses via whatever mechanism is used there).
Submitted by: sam
Approved by: re (blanket)
Diffstat (limited to 'sys/dev/dc')
| -rw-r--r-- | sys/dev/dc/if_dc.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c index 6b2d86c..d135558 100644 --- a/sys/dev/dc/if_dc.c +++ b/sys/dev/dc/if_dc.c @@ -1901,6 +1901,7 @@ dc_attach(dev) struct ifnet *ifp; u_int32_t revision; int unit, error = 0, rid, mac_offset; + u_int8_t *mac; sc = device_get_softc(dev); unit = device_get_unit(dev); @@ -2078,7 +2079,6 @@ dc_attach(dev) * The DC_TX_COALESCE flag is required. */ sc->dc_pmode = DC_PMODE_MII; - /* XXX Call the cardbus function to get nic from the CIS */ break; case DC_DEVICEID_RS7112: sc->dc_type = DC_TYPE_CONEXANT; @@ -2158,7 +2158,13 @@ dc_attach(dev) bcopy(sc->dc_srom + DC_CONEXANT_EE_NODEADDR, &eaddr, 6); break; case DC_TYPE_XIRCOM: - + /* The MAC comes from the CIS */ + mac = pci_get_ether(dev); + if (!mac) { + device_printf(dev, "No station address in CIS!\n"); + goto fail; + } + bcopy(mac, eaddr, ETHER_ADDR_LEN); break; default: dc_read_eeprom(sc, (caddr_t)&eaddr, DC_EE_NODEADDR, 3, 0); |
