qcacld-3.0: Changes to support converged scan component

Changes to support converged scan component.

Change-Id: Ic91a437bcb0b3b0ca4dd6d4fe86fcc86f24dc15f
CRs-Fixed: 2013212
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index 6a4fc8d..ac8efbe 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -5317,7 +5317,9 @@
 		 * the expectation is that by the time Request Full Power has
 		 * completed, all scans will be cancelled
 		 */
+#ifndef NAPIER_SCAN
 		hdd_cleanup_scan_queue(hdd_ctx);
+#endif
 		hdd_abort_mac_scan_all_adapters(hdd_ctx);
 		hdd_abort_sched_scan_all_adapters(hdd_ctx);
 		hdd_stop_all_adapters(hdd_ctx);