From owner-svn-src-releng@FreeBSD.ORG Tue Dec 10 19:14:19 2013 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C899FF98; Tue, 10 Dec 2013 19:14:19 +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 B48B71752; Tue, 10 Dec 2013 19:14:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBAJEJ1j077338; Tue, 10 Dec 2013 19:14:19 GMT (envelope-from gavin@svn.freebsd.org) Received: (from gavin@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBAJEJai077337; Tue, 10 Dec 2013 19:14:19 GMT (envelope-from gavin@svn.freebsd.org) Message-Id: <201312101914.rBAJEJai077337@svn.freebsd.org> From: Gavin Atkinson Date: Tue, 10 Dec 2013 19:14:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259185 - releng/10.0/sys/net80211 X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Dec 2013 19:14:19 -0000 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; }