From 6c46dd833521f303fcb3ba5f97361dd97ce22f24 Mon Sep 17 00:00:00 2001
From: Rajeev Kumar <rajekuma@codeaurora.org>
Date: Fri, 3 Nov 2017 14:21:51 -0700
Subject: [PATCH] qcacld-3.0: Remove duplicate PNO scan update logic from
 legacy HDD

PNO is moved to scan component and logic to update PNO scan result
has also moved to SCM hence remove the duplciate logic from HDD.

Change-Id: I85c601fef72021a053e1d73cc3a295cffb010fbe
CRs-Fixed: 2138067
---
 core/hdd/inc/wlan_hdd_main.h  |  8 -------
 core/hdd/src/wlan_hdd_power.c | 41 -----------------------------------
 core/hdd/src/wlan_hdd_scan.c  |  2 --
 3 files changed, 51 deletions(-)

diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h
index 089aee8f3c44..58f765ea00a1 100644
--- a/core/hdd/inc/wlan_hdd_main.h
+++ b/core/hdd/inc/wlan_hdd_main.h
@@ -1513,17 +1513,9 @@ struct hdd_context {
 
 	void *hdd_ipa;
 
-	/* Use below lock to protect access to isSchedScanUpdatePending
-	 * since it will be accessed in two different contexts.
-	 */
-	qdf_spinlock_t sched_scan_lock;
-
 	/* Flag keeps track of wiphy suspend/resume */
 	bool is_wiphy_suspended;
 
-	/* Indicates about pending sched_scan results */
-	bool isSchedScanUpdatePending;
-
 #ifdef MSM_PLATFORM
 	/* DDR bus bandwidth compute timer
 	 */
diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c
index 5b7f5d634e81..381f67297710 100644
--- a/core/hdd/src/wlan_hdd_power.c
+++ b/core/hdd/src/wlan_hdd_power.c
@@ -1599,8 +1599,6 @@ hdd_sched_scan_results(struct wiphy *wiphy, uint64_t reqid)
 static int __wlan_hdd_cfg80211_resume_wlan(struct wiphy *wiphy)
 {
 	struct hdd_context *hdd_ctx = wiphy_priv(wiphy);
-	struct hdd_adapter *adapter;
-	hdd_adapter_list_node_t *pAdapterNode, *pNext;
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	int exit_code;
 	p_cds_sched_context cds_sched_context = get_cds_sched_ctxt();
@@ -1657,47 +1655,8 @@ static int __wlan_hdd_cfg80211_resume_wlan(struct wiphy *wiphy)
 	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_RESUME_WLAN,
 			 NO_SESSION, hdd_ctx->is_wiphy_suspended));
-	qdf_spin_lock(&hdd_ctx->sched_scan_lock);
 	hdd_ctx->is_wiphy_suspended = false;
-	if (true != hdd_ctx->isSchedScanUpdatePending) {
-		qdf_spin_unlock(&hdd_ctx->sched_scan_lock);
-		hdd_debug("Return resume is not due to PNO indication");
-		goto exit_with_success;
-	}
-	/* Reset flag to avoid updatating cfg80211 data old results again */
-	hdd_ctx->isSchedScanUpdatePending = false;
-	qdf_spin_unlock(&hdd_ctx->sched_scan_lock);
 
-	status = hdd_get_front_adapter(hdd_ctx, &pAdapterNode);
-	while (NULL != pAdapterNode && QDF_STATUS_SUCCESS == status) {
-		adapter = pAdapterNode->adapter;
-		if ((NULL != adapter) &&
-		    (QDF_STA_MODE == adapter->device_mode)) {
-			if (0 !=
-			    wlan_hdd_cfg80211_update_bss(hdd_ctx->wiphy,
-							 adapter, 0)) {
-				hdd_warn("NO SCAN result");
-			} else {
-				/* Acquire wakelock to handle the case where
-				 * APP's tries to suspend immediately after
-				 * updating the scan results. Whis results in
-				 * app's is in suspended state and not able to
-				 * process the connect request to AP
-				 */
-				hdd_prevent_suspend_timeout(
-					HDD_WAKELOCK_TIMEOUT_RESUME,
-					WIFI_POWER_EVENT_WAKELOCK_RESUME_WLAN);
-				hdd_sched_scan_results(hdd_ctx->wiphy, 0);
-			}
-
-			hdd_debug("cfg80211 scan result database updated");
-			goto exit_with_success;
-		}
-		status = hdd_get_next_adapter(hdd_ctx, pAdapterNode, &pNext);
-		pAdapterNode = pNext;
-	}
-
-exit_with_success:
 	hdd_ctx->suspend_resume_stats.resumes++;
 	exit_code = 0;
 
diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c
index bb03b063ac20..bd2e425fb30d 100644
--- a/core/hdd/src/wlan_hdd_scan.c
+++ b/core/hdd/src/wlan_hdd_scan.c
@@ -1706,7 +1706,6 @@ void wlan_hdd_cfg80211_abort_scan(struct wiphy *wiphy,
  */
 void hdd_scan_context_destroy(struct hdd_context *hdd_ctx)
 {
-	qdf_spinlock_destroy(&hdd_ctx->sched_scan_lock);
 }
 
 /**
@@ -1719,6 +1718,5 @@ void hdd_scan_context_destroy(struct hdd_context *hdd_ctx)
  */
 int hdd_scan_context_init(struct hdd_context *hdd_ctx)
 {
-	qdf_spinlock_create(&hdd_ctx->sched_scan_lock);
 	return 0;
 }