diff options
| author | adrian <adrian@FreeBSD.org> | 2016-06-02 04:54:56 +0000 |
|---|---|---|
| committer | adrian <adrian@FreeBSD.org> | 2016-06-02 04:54:56 +0000 |
| commit | f04552e518b391e753b2c2cd286d363fcad26ba6 (patch) | |
| tree | 7b981c3700818b087ae365973ba3119fa6be26e5 | |
| parent | 40a4cbaffde9f0a5b14101094293728643742198 (diff) | |
| download | FreeBSD-src-f04552e518b391e753b2c2cd286d363fcad26ba6.zip FreeBSD-src-f04552e518b391e753b2c2cd286d363fcad26ba6.tar.gz | |
[iwm] Clean up iwm(4) scanning logic a bit.
Submitted by: Imre Vadasz <imre@vdsz.com>
Obtained from: DragonflyBSD 8f3ffab9136e33263d424275ec28f57ad2096437
| -rw-r--r-- | sys/dev/iwm/if_iwm.c | 6 | ||||
| -rw-r--r-- | sys/dev/iwm/if_iwm_scan.c | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/iwm/if_iwm.c b/sys/dev/iwm/if_iwm.c index b04ee30..a13987c 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 ebcadf7..6d68601 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; |
