From dfe72d4f9d18cc9354713c4be63ab274019d82d2 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Tue, 18 Dec 2018 14:00:12 -0800 Subject: [PATCH] qcacld-3.0: Remove csr_roam_get*_pmkid_cache() Change I98ef4dc56bd820849b038de5b33665f3bb7b01b4 ("qcacld-3.0: Remove sme_roam_get*_pmkid_cache()") removed the only clients for the associated CSR functions, so remove the following now obsolete functions: - csr_roam_get_pmkid_cache() - csr_roam_get_num_pmkid_cache() Change-Id: Id535e5b863e3cd2f2ec538159bc5dac13cc8d568 CRs-Fixed: 2370967 --- core/sme/src/csr/csr_api_roam.c | 52 ------------------------------- core/sme/src/csr/csr_inside_api.h | 23 -------------- 2 files changed, 75 deletions(-) diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 978aaf3989d5..42c5fea05f43 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -13846,58 +13846,6 @@ QDF_STATUS csr_roam_del_pmkid_from_cache(struct mac_context *mac, return QDF_STATUS_SUCCESS; } -uint32_t csr_roam_get_num_pmkid_cache(struct mac_context *mac, uint32_t sessionId) -{ - return mac->roam.roamSession[sessionId].NumPmkidCache; -} - -QDF_STATUS csr_roam_get_pmkid_cache(struct mac_context *mac, uint32_t sessionId, - uint32_t *pNum, tPmkidCacheInfo *pPmkidCache) -{ - struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId); - tPmkidCacheInfo *pmksa; - uint16_t i, j; - - if (!pSession) { - sme_err("session %d not found", sessionId); - return QDF_STATUS_E_FAILURE; - } - - if (!pNum || !pPmkidCache) { - sme_err("Either pNum or pPmkidCache is NULL"); - return QDF_STATUS_E_FAILURE; - } - - if (pSession->NumPmkidCache == 0) { - *pNum = 0; - return QDF_STATUS_SUCCESS; - } - - if (*pNum < pSession->NumPmkidCache) - return QDF_STATUS_E_FAILURE; - - if (pSession->NumPmkidCache > CSR_MAX_PMKID_ALLOWED) { - sme_err("NumPmkidCache :%d is more than CSR_MAX_PMKID_ALLOWED, resetting to CSR_MAX_PMKID_ALLOWED", - pSession->NumPmkidCache); - pSession->NumPmkidCache = CSR_MAX_PMKID_ALLOWED; - } - - for (i = 0, j = 0; ((j < pSession->NumPmkidCache) && - (i < CSR_MAX_PMKID_ALLOWED)); i++) { - /* Fill the valid entries */ - pmksa = &pSession->PmkidCacheInfo[i]; - if (!qdf_is_macaddr_zero(&pmksa->BSSID)) { - qdf_mem_copy(pPmkidCache, pmksa, - sizeof(tPmkidCacheInfo)); - pPmkidCache++; - j++; - } - } - - *pNum = pSession->NumPmkidCache; - return QDF_STATUS_SUCCESS; -} - QDF_STATUS csr_roam_get_wpa_rsn_req_ie(struct mac_context *mac, uint32_t sessionId, uint32_t *pLen, uint8_t *pBuf) { diff --git a/core/sme/src/csr/csr_inside_api.h b/core/sme/src/csr/csr_inside_api.h index 0ce1833d0964..4c359d3beb20 100644 --- a/core/sme/src/csr/csr_inside_api.h +++ b/core/sme/src/csr/csr_inside_api.h @@ -766,29 +766,6 @@ QDF_STATUS csr_roam_get_wpa_rsn_req_ie(struct mac_context *mac, uint32_t session QDF_STATUS csr_roam_get_wpa_rsn_rsp_ie(struct mac_context *mac, uint32_t sessionId, uint32_t *pLen, uint8_t *pBuf); -/* - * csr_roam_get_num_pmkid_cache() - - * Return number of PMKID cache entries - * - * Return uint32_t - the number of PMKID cache entries - */ -uint32_t csr_roam_get_num_pmkid_cache(struct mac_context *mac, uint32_t sessionId); - -/* - * csr_roam_get_pmkid_cache() - - * Return PMKID cache from CSR - * - * pNum - caller allocated memory that has the space of the number of pBuf - * tPmkidCacheInfo as input. Upon returned, *pNum has the needed or actually - * number in tPmkidCacheInfo. - * pPmkidCache - Caller allocated memory that contains PMKID cache, if any, - * upon return - * Return QDF_STATUS - when fail, it usually means the buffer allocated is - * not big enough - */ -QDF_STATUS csr_roam_get_pmkid_cache(struct mac_context *mac, uint32_t sessionId, - uint32_t *pNum, tPmkidCacheInfo *pPmkidCache); - /** * csr_roam_get_connect_profile() - To return the current connect profile, * caller must call csr_roam_free_connect_profile after it is done and before