d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove an old hack that remembered if the card type was Linksys by

Browse Source 
storing a flag in the global variable 'linksys' during the probe
routine and reading it during the attach routine. We now have the
ED_VENDOR_LINKSYS vendor code stored in sc->vendor, so check that
instead.
This commit is contained in:
iedowse 2001-07-22 21:31:44 +00:00
parent 12c589f516
commit 25fd88c17a
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/dev/ed/if_ed_pccard.c
View File

@ -76,7 +76,6 @@ static void ed_pccard_dlink_mii_reset(struct ed_softc *sc);
static u_int ed_pccard_dlink_mii_readbits(struct ed_softc *sc, int nbits);
static void ed_pccard_dlink_mii_writebits(struct ed_softc *sc, u_int val,
int nbits);
static int linksys;
/*
* ed_pccard_detach - unload the driver and clear the table.
@ -519,11 +518,8 @@ ed_pccard_probe(device_t dev)
goto end2;
end:
if (ED_FLAGS_GETTYPE(flags) & ED_FLAGS_LINKSYS) {
linksys = ed_pccard_Linksys(dev);
} else {
linksys = 0;
}
if (ED_FLAGS_GETTYPE(flags) & ED_FLAGS_LINKSYS)
ed_pccard_Linksys(dev);
end2:
if (error == 0)
error = ed_alloc_irq(dev, 0, 0);
@ -556,7 +552,7 @@ ed_pccard_attach(device_t dev)
return (error);
}
if (linksys == 0) {
if (sc->vendor != ED_VENDOR_LINKSYS) {
pccard_get_ether(dev, ether_addr);
for (i = 0, sum = 0; i < ETHER_ADDR_LEN; i++)
sum |= ether_addr[i];