From owner-svn-src-head@FreeBSD.ORG  Sat Dec 20 23:41:38 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id AD7078F5;
 Sat, 20 Dec 2014 23:41:38 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9951F1B25;
 Sat, 20 Dec 2014 23:41:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBKNfc4w030622;
 Sat, 20 Dec 2014 23:41:38 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBKNfca8030621;
 Sat, 20 Dec 2014 23:41:38 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201412202341.sBKNfca8030621@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: adrian set sender to
 adrian@FreeBSD.org using -f
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sat, 20 Dec 2014 23:41:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r275973 - head/sys/net80211
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
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/options/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: Sat, 20 Dec 2014 23:41:38 -0000

Author: adrian
Date: Sat Dec 20 23:41:37 2014
New Revision: 275973
URL: https://svnweb.freebsd.org/changeset/base/275973

Log:
  Add some more debugging to the scan cancel methods - I'd like to see
  what situations would cause the scan cancel's to not complete.

Modified:
  head/sys/net80211/ieee80211_scan.c

Modified: head/sys/net80211/ieee80211_scan.c
==============================================================================
--- head/sys/net80211/ieee80211_scan.c	Sat Dec 20 22:58:43 2014	(r275972)
+++ head/sys/net80211/ieee80211_scan.c	Sat Dec 20 23:41:37 2014	(r275973)
@@ -698,6 +698,13 @@ ieee80211_cancel_scan(struct ieee80211va
 		SCAN_PRIVATE(ss)->ss_iflags |= ISCAN_CANCEL;
 		/* wake up the scan task */
 		scan_signal(ss);
+	} else {
+		IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN,
+		    "%s: called; F_SCAN=%d, vap=%s, CANCEL=%d\n",
+		        __func__,
+			!! (ic->ic_flags & IEEE80211_F_SCAN),
+			(ss->ss_vap == vap ? "match" : "nomatch"),
+			!! (SCAN_PRIVATE(ss)->ss_iflags & ISCAN_CANCEL));
 	}
 	IEEE80211_UNLOCK(ic);
 }
@@ -724,6 +731,13 @@ ieee80211_cancel_anyscan(struct ieee8021
 		SCAN_PRIVATE(ss)->ss_iflags |= ISCAN_CANCEL;
 		/* wake up the scan task */
 		scan_signal(ss);
+	} else {
+		IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN,
+		    "%s: called; F_SCAN=%d, vap=%s, CANCEL=%d\n",
+		        __func__,
+			!! (ic->ic_flags & IEEE80211_F_SCAN),
+			(ss->ss_vap == vap ? "match" : "nomatch"),
+			!! (SCAN_PRIVATE(ss)->ss_iflags & ISCAN_CANCEL));
 	}
 	IEEE80211_UNLOCK(ic);
 }