diff options
| author | gavin <gavin@FreeBSD.org> | 2013-12-10 13:36:56 +0000 |
|---|---|---|
| committer | gavin <gavin@FreeBSD.org> | 2013-12-10 13:36:56 +0000 |
| commit | a26c2c1c13e7532e1f62dcde424866110a897621 (patch) | |
| tree | f7c1b90dcf27659d18a2c80b29c6c092bfa42357 /sys/net80211 | |
| parent | 977caa62b94b55fd53e4495dc8a8ce29869135c1 (diff) | |
| download | FreeBSD-src-a26c2c1c13e7532e1f62dcde424866110a897621.zip FreeBSD-src-a26c2c1c13e7532e1f62dcde424866110a897621.tar.gz | |
Merge r258758 (by adrian) from head:
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.
Candidate for 10.0.
Diffstat (limited to 'sys/net80211')
| -rw-r--r-- | sys/net80211/ieee80211_scan.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sys/net80211/ieee80211_scan.c b/sys/net80211/ieee80211_scan.c index c24b631..3a8c24d 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; } |
