From owner-p4-projects@FreeBSD.ORG  Mon May 28 23:53:48 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1FA1916A51E; Mon, 28 May 2007 23:53:48 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 8501916A4D8
	for <perforce@freebsd.org>; Mon, 28 May 2007 23:53:47 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 73FFE13C489
	for <perforce@freebsd.org>; Mon, 28 May 2007 23:53:47 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4SNrlK1099892
	for <perforce@freebsd.org>; Mon, 28 May 2007 23:53:47 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4SNrlv4099883
	for perforce@freebsd.org; Mon, 28 May 2007 23:53:47 GMT
	(envelope-from thompsa@freebsd.org)
Date: Mon, 28 May 2007 23:53:47 GMT
Message-Id: <200705282353.l4SNrlv4099883@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	thompsa@freebsd.org using -f
From: Andrew Thompson <thompsa@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 120528 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 May 2007 23:53:48 -0000

http://perforce.freebsd.org/chv.cgi?CH=120528

Change 120528 by thompsa@thompsa_heff on 2007/05/28 23:52:53

	Allow scans to be aborted by catching the return status and not
	scheduling another scan if it was aborted.

Affected files ...

.. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#27 edit
.. //depot/projects/wifi/sys/dev/iwi/if_iwireg.h#10 edit

Differences ...

==== //depot/projects/wifi/sys/dev/iwi/if_iwi.c#27 (text+ko) ====

@@ -1384,7 +1384,15 @@
 
 		sc->sc_scan_timer = 0;
 		sc->flags &= ~IWI_FLAG_SCANNING;
-		ieee80211_scan_next(ic);
+
+		switch (scan->status) {
+		case IWI_SCAN_COMPLETED:
+			ieee80211_scan_next(ic);
+			break;
+		case IWI_SCAN_ABORTED:
+			ieee80211_cancel_scan(ic);
+			break;
+		}
 
 		break;
 

==== //depot/projects/wifi/sys/dev/iwi/if_iwireg.h#10 (text+ko) ====

@@ -417,6 +417,10 @@
 #define IWI_SCAN_TYPE_BDIRECTED		4 /* active, directed+bcast probe */
 #define IWI_SCAN_TYPES			5
 
+/* scan result codes */
+#define IWI_SCAN_COMPLETED		1 /* scan compeleted sucessfully */
+#define IWI_SCAN_ABORTED		2 /* scan was aborted by the driver */
+
 /* structure for command IWI_CMD_SCAN_EXT */
 struct iwi_scan_ext {
 	uint32_t	full_scan_index;