From 5f699f9b2bc3fc8a1b2af14e8fedbc9616ed1b4a Mon Sep 17 00:00:00 2001 From: gavin Date: Tue, 10 Dec 2013 19:14:19 +0000 Subject: [PATCH] Merge r259173 from stable/10 (head r258758 by adrian): Make sure any waiters on the scan results get notified if the scan task decides to do nothing. If this isn't done, then a scan request whilst a scan occurs in an active channel set or a completed channel set will hang. Approved by: re (glebius) git-svn-id: svn://svn.freebsd.org/base/releng/10.0@259185 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/net80211/ieee80211_scan.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/net80211/ieee80211_scan.c b/sys/net80211/ieee80211_scan.c index c24b6317..3a8c24de 100644 --- a/sys/net80211/ieee80211_scan.c +++ b/sys/net80211/ieee80211_scan.c @@ -859,6 +859,7 @@ scan_task(void *arg, int pending) if (ss->ss_next == ss->ss_last) { IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN, "%s: no channels to scan\n", __func__); + scandone = 1; goto done; } -- 2.42.0