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.

4 files changed, 12 insertions, 0 deletions

diff --git a/sys/dev/ipw/if_ipw.c b/sys/dev/ipw/if_ipw.c
index eac9091a748e..c69ab6d8d975 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);
 }
 
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;
diff --git a/sys/dev/iwn/if_iwn.c b/sys/dev/iwn/if_iwn.c
index f32bdaa602db..9913d90ce68b 100644
--- a/sys/dev/iwn/if_iwn.c
+++ b/sys/dev/iwn/if_iwn.c
@@ -1789,11 +1789,14 @@ iwn_error_intr(struct iwn_softc *sc, uint32_t r1, uint32_t r2)
 {
 	struct ifnet *ifp = sc->sc_ifp;
 	struct ieee80211com *ic = ifp->if_l2com;
+	struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps);
 
 	IWN_LOCK_ASSERT(sc);
 
 	device_printf(sc->sc_dev, "error, INTR=%b STATUS=0x%x\n",
 	    r1, IWN_INTR_BITS, r2);
+	if (vap != NULL)
+		ieee80211_cancel_scan(vap);
 	ieee80211_runtask(ic, &sc->sc_reinit_task);
 }
 
diff --git a/sys/dev/wpi/if_wpi.c b/sys/dev/wpi/if_wpi.c
index 0ab86800a64d..9537dd4e0fa5 100644
--- a/sys/dev/wpi/if_wpi.c
+++ b/sys/dev/wpi/if_wpi.c
@@ -1786,10 +1786,13 @@ wpi_intr(void *arg)
 	if (r & (WPI_SW_ERROR | WPI_HW_ERROR)) {
 		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, "fatal firmware error\n");
 		DPRINTFN(6,("(%s)\n", (r & WPI_SW_ERROR) ? "(Software Error)" :
 				"(Hardware Error)"));
+		if (vap != NULL)
+			ieee80211_cancel_scan(vap);
 		ieee80211_runtask(ic, &sc->sc_restarttask);
 		sc->flags &= ~WPI_FLAG_BUSY;
 		WPI_UNLOCK(sc);