diff options
author | imp <imp@FreeBSD.org> | 2005-10-22 07:26:05 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2005-10-22 07:26:05 +0000 |
commit | 5c82a95730035cde08333eea893f157f200e513a (patch) | |
tree | 1a0c8308b037c0f9c862a6985d866d43fd02cee3 /sys/dev/ed | |
parent | be0b87ae9318f36ecbbd0aec85672bc551305f66 (diff) | |
download | FreeBSD-src-5c82a95730035cde08333eea893f157f200e513a.zip FreeBSD-src-5c82a95730035cde08333eea893f157f200e513a.tar.gz |
Turns out that we're asking for the MAC address at a bad time in the
attach routine. Go ahead and ask for it in the probe routine and be
just as wrong as all the other cards that ask for it there...
# this gets the RTL8019 on a SBC at work fully functional. 6.0 still treats
# the 8019 as a generic NE-2000, so these changes aren't relevant there.
Diffstat (limited to 'sys/dev/ed')
-rw-r--r-- | sys/dev/ed/if_ed_isa.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/dev/ed/if_ed_isa.c b/sys/dev/ed/if_ed_isa.c index ebe2b6b..9f64f96 100644 --- a/sys/dev/ed/if_ed_isa.c +++ b/sys/dev/ed/if_ed_isa.c @@ -115,8 +115,10 @@ ed_isa_probe(device_t dev) ed_release_resources(dev); error = ed_probe_RTL80x9(dev, 0, flags); - if (error == 0) + if (error == 0) { + ed_Novell_read_mac(sc); goto end; + } ed_release_resources(dev); #ifdef ED_3C503 @@ -171,9 +173,6 @@ ed_isa_attach(device_t dev) return (error); } - if (sc->chip_type == ED_CHIP_TYPE_RTL8019) - ed_Novell_read_mac(sc); - #ifdef ED_HPP if (sc->vendor == ED_VENDOR_HP && sc->type == ED_TYPE_HP_PCLANPLUS) sc->readmem = ed_hpp_readmem; |