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

Register the interrupt handler at the end of wi_attach rather than at

Browse Source 
the beginning.  There's a race in the shared interrutp case.  If
another interrupt happens after the interrupt is setup, then we'd try
to lock an uninitialized mutex.  In addition, if we bailed out due to
a too old version of firmware, we'd leave the interrupt enabled with
all the fun that ensues....
This commit is contained in:
Warner Losh 2008-07-26 17:04:30 +00:00
parent b834665cd5
commit febcff0a3b
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sys/dev/wi/if_wi.c
View File

@ -250,19 +250,6 @@ wi_attach(device_t dev)
} }
ic = ifp->if_l2com; ic = ifp->if_l2com;
/*
* NB: no locking is needed here; don't put it here
* unless you can prove it!
*/
error = bus_setup_intr(dev, sc->irq, INTR_TYPE_NET | INTR_MPSAFE,
NULL, wi_intr, sc, &sc->wi_intrhand);
if (error) {
device_printf(dev, "bus_setup_intr() failed! (%d)\n", error);
wi_free(dev);
return error;
}
sc->sc_firmware_type = WI_NOTYPE; sc->sc_firmware_type = WI_NOTYPE;
sc->wi_cmd_count = 500; sc->wi_cmd_count = 500;
/* Reset the NIC. */ /* Reset the NIC. */
@ -473,6 +460,17 @@ wi_attach(device_t dev)
if (bootverbose) if (bootverbose)
ieee80211_announce(ic); ieee80211_announce(ic);
error = bus_setup_intr(dev, sc->irq, INTR_TYPE_NET | INTR_MPSAFE,
NULL, wi_intr, sc, &sc->wi_intrhand);
if (error) {
device_printf(dev, "bus_setup_intr() failed! (%d)\n", error);
bpfdetach(ifp);
ieee80211_ifdetach(ic);
if_free(sc->sc_ifp);
wi_free(dev);
return error;
}
return (0); return (0);
} }