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
This commit is contained in:
Srinivas Girigowda 2015-12-16 18:11:48 -08:00 • committed by Gerrit - the friendly Code Review server
commit 18dcf3d532
3 changed files with 3 additions and 19 deletions

View file

@ -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,

View file

@ -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->

View file

@ -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);