Author: adrian
Date: Thu Jun 2 04:54:56 2016
New Revision: 301190
URL: https://svnweb.freebsd.org/changeset/base/301190
Log:
[iwm] Clean up iwm(4) scanning logic a bit.
Submitted by: Imre Vadasz <i...@vdsz.com>
Obtained from: DragonflyBSD 8f3ffab9136e33263d424275ec28f57ad2096437
Modified:
head/sys/dev/iwm/if_iwm.c
head/sys/dev/iwm/if_iwm_scan.c
Modified: head/sys/dev/iwm/if_iwm.c
==============================================================================
--- head/sys/dev/iwm/if_iwm.c Thu Jun 2 04:53:28 2016 (r301189)
+++ head/sys/dev/iwm/if_iwm.c Thu Jun 2 04:54:56 2016 (r301190)
@@ -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);
Modified: head/sys/dev/iwm/if_iwm_scan.c
==============================================================================
--- head/sys/dev/iwm/if_iwm_scan.c Thu Jun 2 04:53:28 2016
(r301189)
+++ head/sys/dev/iwm/if_iwm_scan.c Thu Jun 2 04:54:56 2016
(r301190)
@@ -443,7 +443,6 @@ iwm_mvm_scan_request(struct iwm_softc *s
* 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;
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
