From owner-svn-src-all@FreeBSD.ORG  Tue Dec 10 13:36:57 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1D2D97A9;
 Tue, 10 Dec 2013 13:36:57 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 092F91CC2;
 Tue, 10 Dec 2013 13:36:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBADauFw053098;
 Tue, 10 Dec 2013 13:36:56 GMT (envelope-from gavin@svn.freebsd.org)
Received: (from gavin@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBADauFV053097;
 Tue, 10 Dec 2013 13:36:56 GMT (envelope-from gavin@svn.freebsd.org)
Message-Id: <201312101336.rBADauFV053097@svn.freebsd.org>
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Tue, 10 Dec 2013 13:36:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r259173 - stable/10/sys/net80211
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Dec 2013 13:36:57 -0000

Author: gavin
Date: Tue Dec 10 13:36:56 2013
New Revision: 259173
URL: http://svnweb.freebsd.org/changeset/base/259173

Log:
  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.

Modified:
  stable/10/sys/net80211/ieee80211_scan.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/net80211/ieee80211_scan.c
==============================================================================
--- stable/10/sys/net80211/ieee80211_scan.c	Tue Dec 10 13:35:04 2013	(r259172)
+++ stable/10/sys/net80211/ieee80211_scan.c	Tue Dec 10 13:36:56 2013	(r259173)
@@ -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;
 	}