From cd7d06ac7ead1b6d3688d699dcc9c6c56d654ec7 Mon Sep 17 00:00:00 2001
From: Andriy Voskoboinyk <avos@FreeBSD.org>
Date: Sat, 21 May 2016 23:21:42 +0000
Subject: [PATCH] net80211: send RTM_IEEE80211_SCAN event when scan was
 cancelled.

wpa_supplicant(8) expects to see 'scan complete' event after every
scan command; in case, when event is not sent it will hang for
indefinite time.

PR:		209198
---
 sys/net80211/ieee80211_scan_sw.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys/net80211/ieee80211_scan_sw.c b/sys/net80211/ieee80211_scan_sw.c
index f1415cb8f1f..836dd51b00e 100644
--- a/sys/net80211/ieee80211_scan_sw.c
+++ b/sys/net80211/ieee80211_scan_sw.c
@@ -865,10 +865,10 @@ scan_done(struct ieee80211_scan_state *ss, int scandone)
 	 */
 	if (scandone) {
 		vap->iv_sta_ps(vap, 0);
-		if (ss->ss_next >= ss->ss_last) {
-			ieee80211_notify_scan_done(vap);
+		if (ss->ss_next >= ss->ss_last)
 			ic->ic_flags_ext &= ~IEEE80211_FEXT_BGSCAN;
-		}
+
+		ieee80211_notify_scan_done(vap);
 	}
 	ss_priv->ss_iflags &= ~(ISCAN_CANCEL|ISCAN_ABORT);
 	ss_priv->ss_scanend = 0;