diff options
| author | Andrew Thompson <thompsa@FreeBSD.org> | 2009-05-10 02:44:19 +0000 |
|---|---|---|
| committer | Andrew Thompson <thompsa@FreeBSD.org> | 2009-05-10 02:44:19 +0000 |
| commit | e1d2045e3fc583a96ccba6d0da14c26a596136ae (patch) | |
| tree | e61a7862b55b33760a6aafa9c188f6e7c22f248f /sys/dev/iwi | |
| parent | b016f58c5184b450789cddf7b2261b946d04ba36 (diff) | |
| download | src-e1d2045e3fc583a96ccba6d0da14c26a596136ae.tar.gz src-e1d2045e3fc583a96ccba6d0da14c26a596136ae.zip | |
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.
Notes
Notes:
svn path=/head/; revision=191956
Diffstat (limited to 'sys/dev/iwi')
| -rw-r--r-- | sys/dev/iwi/if_iwi.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sys/dev/iwi/if_iwi.c b/sys/dev/iwi/if_iwi.c index 6513522ab5b1..f7d891e3d6fe 100644 --- a/sys/dev/iwi/if_iwi.c +++ b/sys/dev/iwi/if_iwi.c @@ -1635,8 +1635,11 @@ iwi_fatal_error_intr(struct iwi_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_restarttask); sc->flags &= ~IWI_FLAG_BUSY; |