svn commit: r275973 - head/sys/net80211

[Adrian Chadd]

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);
 }