From d5cdb2b39b2862f628980b6951c1bf1a96bd53bf Mon Sep 17 00:00:00 2001
From: Harprit Chhabada <harpritchhabada@codeaurora.org>
Date: Thu, 7 Mar 2019 16:52:14 -0800
Subject: [PATCH] qcacmn: Clean up CONFIG_MCL for scan related macros

Clean up CONFIG_MCL and add all below scan
related macro in the defaul_defconfig file.
Macros related to WIN will be part of WIN Kbuild.

MAX_SCAN_CACHE_SIZE 300
SCAN_MAX_REST_TIME 0
SCAN_MIN_REST_TIME 0
SCAN_BURST_DURATION 0
SCAN_PROBE_SPACING_TIME 0
SCAN_PROBE_DELAY 0
SCAN_MAX_SCAN_TIME 30000
SCAN_NETWORK_IDLE_TIMEOUT 0
HIDDEN_SSID_TIME (1*60*1000)
SCAN_CHAN_STATS_EVENT_ENAB (false)

Change-Id: I9c8cb010111c6255309f36209cabc011e32f3f0f
CRs-Fixed: 2412734
---
 umac/scan/core/src/wlan_scan_main.h | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/umac/scan/core/src/wlan_scan_main.h b/umac/scan/core/src/wlan_scan_main.h
index e06a6844e3..dd003a9587 100644
--- a/umac/scan/core/src/wlan_scan_main.h
+++ b/umac/scan/core/src/wlan_scan_main.h
@@ -112,18 +112,7 @@ struct probe_time_dwell_time {
 #define SCM_NUM_RSSI_CAT        15
 #define SCAN_STA_MIRACAST_MCC_REST_TIME 400
 
-#ifdef CONFIG_MCL
-#define MAX_SCAN_CACHE_SIZE 300
-#define SCAN_MAX_REST_TIME 0
-#define SCAN_MIN_REST_TIME 0
-#define SCAN_BURST_DURATION 0
-#define SCAN_PROBE_SPACING_TIME 0
-#define SCAN_PROBE_DELAY 0
-#define SCAN_MAX_SCAN_TIME 30000
-#define SCAN_NETWORK_IDLE_TIMEOUT 0
-#define HIDDEN_SSID_TIME (1*60*1000)
-#define SCAN_CHAN_STATS_EVENT_ENAB (false)
-#else
+#ifndef CONFIG_MCL
 #define MAX_SCAN_CACHE_SIZE 1024
 #define SCAN_MAX_REST_TIME 0
 #define SCAN_MIN_REST_TIME 50