aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/dev/iwm/if_iwm.c6
-rw-r--r--sys/dev/iwm/if_iwm_scan.c1
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/iwm/if_iwm.c b/sys/dev/iwm/if_iwm.c
index b04ee3088bd8..a13987c4ac2a 100644
--- a/sys/dev/iwm/if_iwm.c
+++ b/sys/dev/iwm/if_iwm.c
@@ -3642,7 +3642,8 @@ iwm_endscan_cb(void *arg, int pending)
done = 0;
if ((error = iwm_mvm_scan_request(sc,
IEEE80211_CHAN_5GHZ, 0, NULL, 0)) != 0) {
- device_printf(sc->sc_dev, "could not initiate scan\n");
+ device_printf(sc->sc_dev,
+ "could not initiate 5 GHz scan\n");
done = 1;
}
} else {
@@ -4883,9 +4884,10 @@ iwm_scan_start(struct ieee80211com *ic)
IWM_LOCK(sc);
error = iwm_mvm_scan_request(sc, IEEE80211_CHAN_2GHZ, 0, NULL, 0);
if (error) {
- device_printf(sc->sc_dev, "could not initiate scan\n");
+ device_printf(sc->sc_dev, "could not initiate 2 GHz scan\n");
IWM_UNLOCK(sc);
ieee80211_cancel_scan(vap);
+ sc->sc_scanband = 0;
} else {
iwm_led_blink_start(sc);
IWM_UNLOCK(sc);
diff --git a/sys/dev/iwm/if_iwm_scan.c b/sys/dev/iwm/if_iwm_scan.c
index ebcadf77e39e..6d6860129524 100644
--- a/sys/dev/iwm/if_iwm_scan.c
+++ b/sys/dev/iwm/if_iwm_scan.c
@@ -443,7 +443,6 @@ iwm_mvm_scan_request(struct iwm_softc *sc, int flags,
* to allocate the time events. Warn on it, but maybe we
* should try to send the command again with different params.
*/
- sc->sc_scanband = 0;
ret = EIO;
}
return ret;