From owner-svn-src-head@FreeBSD.ORG  Sun Jan 30 14:05:21 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 DE4931065675;
	Sun, 30 Jan 2011 14:05:21 +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 CE6F08FC08;
	Sun, 30 Jan 2011 14:05:21 +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 p0UE5Lim074029;
	Sun, 30 Jan 2011 14:05:21 GMT
	(envelope-from bschmidt@svn.freebsd.org)
Received: (from bschmidt@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0UE5LLL074027;
	Sun, 30 Jan 2011 14:05:21 GMT
	(envelope-from bschmidt@svn.freebsd.org)
Message-Id: <201101301405.p0UE5LLL074027@svn.freebsd.org>
From: Bernhard Schmidt <bschmidt@FreeBSD.org>
Date: Sun, 30 Jan 2011 14:05:21 +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: r218092 - head/sys/net80211
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 14:05:22 -0000

Author: bschmidt
Date: Sun Jan 30 14:05:21 2011
New Revision: 218092
URL: http://svn.freebsd.org/changeset/base/218092

Log:
  Instead of always returning 0 to a scan request, indicate if there is
  one running already.
  
  MFC after:	1 month

Modified:
  head/sys/net80211/ieee80211_ioctl.c

Modified: head/sys/net80211/ieee80211_ioctl.c
==============================================================================
--- head/sys/net80211/ieee80211_ioctl.c	Sun Jan 30 14:00:50 2011	(r218091)
+++ head/sys/net80211/ieee80211_ioctl.c	Sun Jan 30 14:05:21 2011	(r218092)
@@ -2384,7 +2384,7 @@ ieee80211_scanreq(struct ieee80211vap *v
 	 IEEE80211_IOC_SCAN_NOJOIN | IEEE80211_IOC_SCAN_FLUSH | \
 	 IEEE80211_IOC_SCAN_CHECK)
 	struct ieee80211com *ic = vap->iv_ic;
-	int i;
+	int error, i;
 
 	/* convert duration */
 	if (sr->sr_duration == IEEE80211_IOC_SCAN_FOREVER)
@@ -2458,20 +2458,21 @@ ieee80211_scanreq(struct ieee80211vap *v
 	} else {
 		vap->iv_flags_ext &= ~IEEE80211_FEXT_SCANREQ;
 		IEEE80211_UNLOCK(ic);
-		/* XXX neeed error return codes */
 		if (sr->sr_flags & IEEE80211_IOC_SCAN_CHECK) {
-			(void) ieee80211_check_scan(vap, sr->sr_flags,
+			error = ieee80211_check_scan(vap, sr->sr_flags,
 			    sr->sr_duration, sr->sr_mindwell, sr->sr_maxdwell,
 			    sr->sr_nssid,
 			    /* NB: cheat, we assume structures are compatible */
 			    (const struct ieee80211_scan_ssid *) &sr->sr_ssid[0]);
 		} else {
-			(void) ieee80211_start_scan(vap, sr->sr_flags,
+			error = ieee80211_start_scan(vap, sr->sr_flags,
 			    sr->sr_duration, sr->sr_mindwell, sr->sr_maxdwell,
 			    sr->sr_nssid,
 			    /* NB: cheat, we assume structures are compatible */
 			    (const struct ieee80211_scan_ssid *) &sr->sr_ssid[0]);
 		}
+		if (error == 0)
+			return EINPROGRESS;
 	}
 	return 0;
 #undef IEEE80211_IOC_SCAN_FLAGS