Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d4ce0f3 authored by Srinivas Girigowda's avatar Srinivas Girigowda Committed by Akash Patel
Browse files

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
parent 3a28a11c

core/mac/src/pe/lim/lim_api.c

+2 −2
Original line number Diff line number Diff line
@@ -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) !=

core/mac/src/pe/lim/lim_assoc_utils.c

+9 −27
Original line number Diff line number Diff line
@@ -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.

 *

 ***LOGIC:

 *

 ***ASSUMPTIONS:

 * NA

 *

 ***NOTE:

 * NA

 *

 * @param  *prxSSid - pointer to SSID structure

 * to determine whether received SSID is same as SSID in use.

 *

 * @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()

core/mac/src/pe/lim/lim_assoc_utils.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

core/mac/src/pe/lim/lim_process_assoc_req_frame.c

+1 −1
Original line number Diff line number Diff line
@@ -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 "