From 85090c94e907cf7a96a24b5e0db44e2eb4f08091 Mon Sep 17 00:00:00 2001
From: Varun Reddy Yeturu <varunreddy.yeturu@codeaurora.org>
Date: Fri, 26 Jan 2018 15:06:02 -0800
Subject: [PATCH] qcacld-3.0: Cancel scans during roaming

Upon receiving a ROAM_START from the firmware,
cancel the current scans which is similar to
initial connection which will avoid unnecessary
frames to the host during the connection process.

Change-Id: I0c9a4dd7cd4d58e0583cc44b5e33e88728eb70bb
CRs-Fixed: 2174921
---
 core/sme/src/csr/csr_api_roam.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index 8ba1f55a0320..6ae501a2454c 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -59,6 +59,7 @@
 #include "wlan_objmgr_psoc_obj.h"
 #include <wlan_scan_ucfg_api.h>
 #include <wlan_tdls_tgt_api.h>
+#include <wlan_cfg80211_scan.h>
 
 #define MAX_PWR_FCC_CHAN_12 8
 #define MAX_PWR_FCC_CHAN_13 2
@@ -21112,6 +21113,8 @@ static QDF_STATUS csr_process_roam_sync_callback(tpAniSirGlobal mac_ctx,
 				ROAMING_OFFLOAD_TIMER_START);
 		csr_roam_call_callback(mac_ctx, session_id, NULL, 0,
 				eCSR_ROAM_START, eCSR_ROAM_RESULT_SUCCESS);
+		wlan_abort_scan(mac_ctx->pdev, INVAL_PDEV_ID,
+				session_id, INVAL_SCAN_ID, false);
 		return status;
 	case SIR_ROAMING_ABORT:
 		csr_roam_roaming_offload_timer_action(mac_ctx,