diff options
| author | thompsa <thompsa@FreeBSD.org> | 2009-05-10 02:44:19 +0000 |
|---|---|---|
| committer | thompsa <thompsa@FreeBSD.org> | 2009-05-10 02:44:19 +0000 |
| commit | ff540a7f599a544251236e9926ca2f2cf4c11de0 (patch) | |
| tree | e61a7862b55b33760a6aafa9c188f6e7c22f248f /sys/dev/ipw | |
| parent | aae9005ac300568382cff11869223c881b3d0241 (diff) | |
| download | FreeBSD-src-ff540a7f599a544251236e9926ca2f2cf4c11de0.zip FreeBSD-src-ff540a7f599a544251236e9926ca2f2cf4c11de0.tar.gz | |
Abort any scan on a fatal firmware. ic_scan_curchan is overridden to perform
the scan in firmware and this relies on the firmware to wake up the scan task
on completion.
Diffstat (limited to 'sys/dev/ipw')
| -rw-r--r-- | sys/dev/ipw/if_ipw.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sys/dev/ipw/if_ipw.c b/sys/dev/ipw/if_ipw.c index eac9091..c69ab6d 100644 --- a/sys/dev/ipw/if_ipw.c +++ b/sys/dev/ipw/if_ipw.c @@ -1384,8 +1384,11 @@ ipw_fatal_error_intr(struct ipw_softc *sc) { struct ifnet *ifp = sc->sc_ifp; struct ieee80211com *ic = ifp->if_l2com; + struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); device_printf(sc->sc_dev, "firmware error\n"); + if (vap != NULL) + ieee80211_cancel_scan(vap); ieee80211_runtask(ic, &sc->sc_init_task); } |
