diff options
author | ps <ps@FreeBSD.org> | 2000-06-29 07:31:37 +0000 |
---|---|---|
committer | ps <ps@FreeBSD.org> | 2000-06-29 07:31:37 +0000 |
commit | 9028f8e470f5c73c9d6932a29dbdc459e81fab9c (patch) | |
tree | ec049ffb01a487979868e2216452bb5db66ff97e /sys/dev/ed/if_ed_pccard.c | |
parent | e8e6955a9f446d3deaaed2356559c7372f49a831 (diff) | |
download | FreeBSD-src-9028f8e470f5c73c9d6932a29dbdc459e81fab9c.zip FreeBSD-src-9028f8e470f5c73c9d6932a29dbdc459e81fab9c.tar.gz |
Only try to detect Linksys PCMCIA cards when we are in a pccard
environment. This fixes the breakage to ISA ethernet cards.
Reviewed by: peter
Diffstat (limited to 'sys/dev/ed/if_ed_pccard.c')
-rw-r--r-- | sys/dev/ed/if_ed_pccard.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/dev/ed/if_ed_pccard.c b/sys/dev/ed/if_ed_pccard.c index 678f87a..63b0e7b 100644 --- a/sys/dev/ed/if_ed_pccard.c +++ b/sys/dev/ed/if_ed_pccard.c @@ -150,11 +150,13 @@ ed_pccard_attach(device_t dev) return (error); } - pccard_get_ether(dev, ether_addr); - for (i = 0, sum = 0; i < ETHER_ADDR_LEN; i++) - sum |= ether_addr[i]; - if (sum) - bcopy(ether_addr, sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); + if (ed_get_Linksys(sc) == 0) { + pccard_get_ether(dev, ether_addr); + for (i = 0, sum = 0; i < ETHER_ADDR_LEN; i++) + sum |= ether_addr[i]; + if (sum) + bcopy(ether_addr, sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); + } error = ed_attach(sc, device_get_unit(dev), flags); return (error); |