From cba74734a1f00f51db6d5ab9cdbc678c7bb505dc Mon Sep 17 00:00:00 2001
From: Srinivas Girigowda <sgirigow@qca.qualcomm.com>
Date: Thu, 14 Jan 2016 17:35:25 -0800
Subject: [PATCH] qcacld-3.0: Fix mangled function lim_cmp_s_sid()

Fix mangled API lim_cmp_s_sid() to lim_cmp_ssid() which were
introduced while converting the names programmatically.

Change-Id: I3a6d4b8678fc815fb8c8787bd080c9188ef98f67
CRs-Fixed: 882962
---
 core/mac/src/pe/lim/lim_api.c                 |  4 +--
 core/mac/src/pe/lim/lim_assoc_utils.c         | 36 +++++--------------
 core/mac/src/pe/lim/lim_assoc_utils.h         |  2 +-
 .../src/pe/lim/lim_process_assoc_req_frame.c  |  2 +-
 4 files changed, 13 insertions(+), 31 deletions(-)

diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c
index 14fcfb71cc21..2584645074bf 100644
--- a/core/mac/src/pe/lim/lim_api.c
+++ b/core/mac/src/pe/lim/lim_api.c
@@ -1417,7 +1417,7 @@ lim_handle_ibss_coalescing(tpAniSirGlobal pMac,
 	   4. Encyption type in the beacon does not match with self station
 	 */
 	if ((!pBeacon->capabilityInfo.ibss) ||
-	    (lim_cmp_s_sid(pMac, &pBeacon->ssId, psessionEntry) != true) ||
+	    (lim_cmp_ssid(&pBeacon->ssId, psessionEntry) != true) ||
 	    (psessionEntry->currentOperChannel != pBeacon->channelNumber))
 		retCode = eSIR_LIM_IGNORE_BEACON;
 	else if (lim_ibss_enc_type_matched(pBeacon, psessionEntry) != eSIR_TRUE) {
@@ -1553,7 +1553,7 @@ lim_detect_change_in_ap_capabilities(tpAniSirGlobal pMac,
 						     psessionEntry);
 	if ((false == psessionEntry->limSentCapsChangeNtf) &&
 	    (((!lim_is_null_ssid(&pBeacon->ssId)) &&
-	       (false == lim_cmp_s_sid(pMac, &pBeacon->ssId, psessionEntry))) ||
+	       (false == lim_cmp_ssid(&pBeacon->ssId, psessionEntry))) ||
 	     ((SIR_MAC_GET_ESS(apNewCaps.capabilityInfo) !=
 	       SIR_MAC_GET_ESS(psessionEntry->limCurrentBssCaps)) ||
 	      (SIR_MAC_GET_PRIVACY(apNewCaps.capabilityInfo) !=
diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c
index 3c47c79b0cd9..cb797399aa0a 100644
--- a/core/mac/src/pe/lim/lim_assoc_utils.c
+++ b/core/mac/src/pe/lim/lim_assoc_utils.c
@@ -85,38 +85,20 @@ lim_fill_supported_rates_info(tpAniSirGlobal pMac,
 }
 
 /**
- * lim_cmp_s_sid()
+ * lim_cmp_ssid() - utility function to compare SSIDs
+ * @rx_ssid: Received SSID
+ * @session_entry: Session entry
  *
- ***FUNCTION:
  * This function is called in various places within LIM code
- * to determine whether received SSid is same as SSID in use.
+ * to determine whether received SSID is same as SSID in use.
  *
- ***LOGIC:
- *
- ***ASSUMPTIONS:
- * NA
- *
- ***NOTE:
- * NA
- *
- * @param  *prxSSid - pointer to SSID structure
- *
- * @return status - true for SSID match else false.
+ * Return: true if SSID matched, false otherwise.
  */
-
-uint8_t
-lim_cmp_s_sid(tpAniSirGlobal pMac, tSirMacSSid *prxSSid,
-	      tpPESession psessionEntry)
+bool lim_cmp_ssid(tSirMacSSid *rx_ssid, tpPESession session_entry)
 {
-
-	if (cdf_mem_compare
-		    ((uint8_t *) prxSSid, (uint8_t *) &psessionEntry->ssId,
-		    (uint8_t) (psessionEntry->ssId.length + 1)))
-		return true;
-	else
-		return false;
-
-} /****** end lim_cmp_s_sid() ******/
+	return cdf_mem_compare(rx_ssid, &session_entry->ssId,
+				session_entry->ssId.length);
+}
 
 /**
  * lim_compare_capabilities()
diff --git a/core/mac/src/pe/lim/lim_assoc_utils.h b/core/mac/src/pe/lim/lim_assoc_utils.h
index f869ad3b7fa9..c0fc5a9e32a7 100644
--- a/core/mac/src/pe/lim/lim_assoc_utils.h
+++ b/core/mac/src/pe/lim/lim_assoc_utils.h
@@ -45,7 +45,7 @@
 
 #include "lim_types.h"
 
-uint8_t lim_cmp_s_sid(tpAniSirGlobal, tSirMacSSid *, tpPESession);
+bool lim_cmp_ssid(tSirMacSSid *, tpPESession);
 uint8_t lim_compare_capabilities(tpAniSirGlobal,
 				 tSirAssocReq *,
 				 tSirMacCapabilityInfo *, tpPESession);
diff --git a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c
index cda12aa0ff11..e7418bd49ef1 100644
--- a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c
+++ b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c
@@ -418,7 +418,7 @@ lim_process_assoc_req_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
 
 	updateContext = false;
 
-	if (lim_cmp_s_sid(pMac, &pAssocReq->ssId, psessionEntry) == false) {
+	if (lim_cmp_ssid(&pAssocReq->ssId, psessionEntry) == false) {
 		lim_log(pMac, LOGE,
 			FL("Received %s Req with unmatched ssid ( Received"
 			   " SSID: %.*s current SSID: %.*s ) from "