From owner-p4-projects@FreeBSD.ORG  Fri Sep 16 16:57:23 2005
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 88B1416A421; Fri, 16 Sep 2005 16:57:22 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6336D16A41F
	for <perforce@freebsd.org>; Fri, 16 Sep 2005 16:57:22 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3326943D45
	for <perforce@freebsd.org>; Fri, 16 Sep 2005 16:57:22 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j8GGvMbW010245
	for <perforce@freebsd.org>; Fri, 16 Sep 2005 16:57:22 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j8GGvLCq010242
	for perforce@freebsd.org; Fri, 16 Sep 2005 16:57:21 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 16 Sep 2005 16:57:21 GMT
Message-Id: <200509161657.j8GGvLCq010242@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 83748 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: Fri, 16 Sep 2005 16:57:23 -0000

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

Change 83748 by sam@sam_ebb on 2005/09/16 16:56:24

	optimize cancel scan; check if cancel already requested

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_scan.c#3 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_scan.c#3 (text+ko) ====

@@ -554,7 +554,8 @@
 	struct ieee80211_scan_state *ss = ic->ic_scan;
 
 	IEEE80211_LOCK(ic);
-	if (ic->ic_flags & IEEE80211_F_SCAN) {
+	if ((ic->ic_flags & IEEE80211_F_SCAN) &&
+	    (SCAN_PRIVATE(ss)->ss_iflags & ISCAN_CANCEL) == 0) {
 		IEEE80211_DPRINTF(ic, IEEE80211_MSG_SCAN,
 		    "%s: cancel %s scan\n", __func__,
 		    ss->ss_flags & IEEE80211_SCAN_ACTIVE ?