From 18dcf3d53208c1740dc5abaf4a71e191d0053474 Mon Sep 17 00:00:00 2001
From: Srinivas Girigowda <sgirigow@codeaurora.org>
Date: Wed, 16 Dec 2015 18:11:48 -0800
Subject: [PATCH] qcacld-3.0: Remove csr_neighbor_roam_is_ese_assoc()

There are two utility functions to check if the association
is ESE or not. csr_neighbor_roam_is_ese_assoc() and
csr_roam_is_ese_assoc().

Both serves the same purpose, hence remove csr_neighbor_roam_is_ese_assoc()
and use csr_roam_is_ese_assoc().

Change-Id: I857f9c16eb73a4b0f72e0a622be47ab756fb70f4
CRs-Fixed: 950762
---
 core/sme/inc/csr_internal.h     |  1 -
 core/sme/src/csr/csr_api_roam.c | 19 ++-----------------
 core/sme/src/rrm/sme_rrm.c      |  2 +-
 3 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h
index 07246ae2eeff..3b5616280317 100644
--- a/core/sme/inc/csr_internal.h
+++ b/core/sme/inc/csr_internal.h
@@ -1283,7 +1283,6 @@ bool csr_roam_is11r_assoc(tpAniSirGlobal pMac, uint8_t sessionId);
 /* Returns whether the current association is a ESE assoc or not */
 bool csr_roam_is_ese_assoc(tpAniSirGlobal pMac, uint8_t sessionId);
 bool csr_roam_is_ese_ini_feature_enabled(tpAniSirGlobal pMac);
-bool csr_neighbor_roam_is_ese_assoc(tpAniSirGlobal pMac, uint8_t sessionId);
 QDF_STATUS csr_get_tsm_stats(tpAniSirGlobal pMac,
 		tCsrTsmStatsCallback callback,
 		uint8_t staId,
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index b877c2e9d007..81ea9fadad07 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -1553,27 +1553,12 @@ QDF_STATUS csr_create_roam_scan_channel_list(tpAniSirGlobal pMac,
 bool csr_roam_is_ese_assoc(tpAniSirGlobal mac_ctx, uint8_t session_id)
 {
 #ifdef WLAN_FEATURE_NEIGHBOR_ROAMING
-	return csr_neighbor_roam_is_ese_assoc(mac_ctx, session_id);
+	return mac_ctx->roam.neighborRoamInfo[session_id].isESEAssoc;
 #else
 	return false;
 #endif
 }
 
-/**
- * csr_neighbor_roam_is_ese_assoc() - Check the Association type
- * @mac_ctx: Global MAC Context
- * @session_id: Session ID on which the check should be done
- *
- * This function returns whether the current association
- * is a ESE assoc or not
- *
- * Return: True if ESE association, false otherwise.
- **/
-bool csr_neighbor_roam_is_ese_assoc(tpAniSirGlobal mac_ctx, uint8_t session_id)
-{
-	return mac_ctx->roam.neighborRoamInfo[session_id].isESEAssoc;
-}
-
 /**
  * csr_roam_is_roam_offload_scan_enabled() - is roam offload enabled
  * @mac_ctx: Global MAC context
@@ -16804,7 +16789,7 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx,
 	req_buf->MAWCEnabled = mac_ctx->roam.configParam.MAWCEnabled;
 #ifdef FEATURE_WLAN_ESE
 	req_buf->IsESEAssoc =
-		csr_neighbor_roam_is_ese_assoc(mac_ctx, session_id) &&
+		csr_roam_is_ese_assoc(mac_ctx, session_id) &&
 		((req_buf->ConnectedNetwork.authentication ==
 			eCSR_AUTH_TYPE_OPEN_SYSTEM)  ||
 		(csr_is_auth_type_ese(req_buf->
diff --git a/core/sme/src/rrm/sme_rrm.c b/core/sme/src/rrm/sme_rrm.c
index d99411e89b8e..45431c17448c 100644
--- a/core/sme/src/rrm/sme_rrm.c
+++ b/core/sme/src/rrm/sme_rrm.c
@@ -1187,7 +1187,7 @@ QDF_STATUS sme_rrm_process_neighbor_report(tpAniSirGlobal pMac, void *pMsgBuf)
 	if (QDF_IS_STATUS_SUCCESS(status)) {
 #ifdef FEATURE_WLAN_ESE
 		/* Clear the cache for ESE. */
-		if (csr_neighbor_roam_is_ese_assoc(pMac, sessionId)) {
+		if (csr_roam_is_ese_assoc(pMac, sessionId)) {
 			rrm_ll_purge_neighbor_cache(pMac,
 						    &pMac->rrm.rrmSmeContext.
 						    neighborReportCache);