Date: Tue, 10 Dec 2013 19:14:19 +0000 (UTC) From: Gavin Atkinson <gavin@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259185 - releng/10.0/sys/net80211 Message-ID: <201312101914.rBAJEJai077337@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gavin Date: Tue Dec 10 19:14:19 2013 New Revision: 259185 URL: http://svnweb.freebsd.org/changeset/base/259185 Log: 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) Modified: releng/10.0/sys/net80211/ieee80211_scan.c Directory Properties: releng/10.0/ (props changed) Modified: releng/10.0/sys/net80211/ieee80211_scan.c ============================================================================== --- releng/10.0/sys/net80211/ieee80211_scan.c Tue Dec 10 19:12:16 2013 (r259184) +++ releng/10.0/sys/net80211/ieee80211_scan.c Tue Dec 10 19:14:19 2013 (r259185) @@ -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; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312101914.rBAJEJai077337>