From owner-svn-src-head@FreeBSD.ORG  Sun Jan 30 13:17:45 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9C4631065679;
	Sun, 30 Jan 2011 13:17:45 +0000 (UTC)
	(envelope-from bschmidt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8C7FF8FC16;
	Sun, 30 Jan 2011 13:17:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0UDHja6072819;
	Sun, 30 Jan 2011 13:17:45 GMT
	(envelope-from bschmidt@svn.freebsd.org)
Received: (from bschmidt@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0UDHjuq072817;
	Sun, 30 Jan 2011 13:17:45 GMT
	(envelope-from bschmidt@svn.freebsd.org)
Message-Id: <201101301317.p0UDHjuq072817@svn.freebsd.org>
From: Bernhard Schmidt <bschmidt@FreeBSD.org>
Date: Sun, 30 Jan 2011 13:17:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r218090 - head/sbin/ifconfig
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Jan 2011 13:17:45 -0000

Author: bschmidt
Date: Sun Jan 30 13:17:45 2011
New Revision: 218090
URL: http://svn.freebsd.org/changeset/base/218090

Log:
  When doing a scan while being associated it is possible that the scan
  is deferred for the time it takes to flush the TX queue. This work being
  done the scan then is continued, but only if it is marked to do so. As
  the 'ifconfig scan' request is meant to be used after the interface is
  brought up, request a background scan by default. This behaviour is
  already documented in manual page.
  
  This fixes on possible case where 'ifconfig scan' hangs infinitely.
  
  MFC after:	1 month

Modified:
  head/sbin/ifconfig/ifieee80211.c

Modified: head/sbin/ifconfig/ifieee80211.c
==============================================================================
--- head/sbin/ifconfig/ifieee80211.c	Sun Jan 30 12:57:10 2011	(r218089)
+++ head/sbin/ifconfig/ifieee80211.c	Sun Jan 30 13:17:45 2011	(r218090)
@@ -3222,6 +3222,7 @@ scan_and_wait(int s)
 
 	memset(&sr, 0, sizeof(sr));
 	sr.sr_flags = IEEE80211_IOC_SCAN_ACTIVE
+		    | IEEE80211_IOC_SCAN_BGSCAN
 		    | IEEE80211_IOC_SCAN_NOPICK
 		    | IEEE80211_IOC_SCAN_ONCE;
 	sr.sr_duration = IEEE80211_IOC_SCAN_FOREVER;