prima: Remove a redundant HDD cache for PMKID.
This fix contains two changes -
1. Increase the size of PMKID cache in csr.
Also the cache size is changed to 32 to make it equal
to the size in supplicant.
2. Optimization changes to remove the HDD PMKID cache.
CSR maintains a cache already for PMKID, hence a HDD
cache is redundant. Also this fix ensures that the
cache always contains the last saved PMKIDs and does
not over-write them
Change-Id: Ibb6676f65e771c7ac6315622fa04c373656791bb
CRs-Fixed: 729385
diff --git a/CORE/HDD/inc/wlan_hdd_main.h b/CORE/HDD/inc/wlan_hdd_main.h
index 7f2688d..a01e68f 100644
--- a/CORE/HDD/inc/wlan_hdd_main.h
+++ b/CORE/HDD/inc/wlan_hdd_main.h
@@ -278,9 +278,6 @@
#define SNR_CONTEXT_MAGIC 0x534E5200 //SNR
#define BCN_MISS_RATE_CONTEXT_MAGIC 0x513F5753
-/* Max PMKSAIDS available in cache */
-#define MAX_PMKSAIDS_IN_CACHE 8
-
/*
* Driver miracast parameters 0-Disabled
* 1-Source, 2-Sink
@@ -673,9 +670,6 @@
v_BOOL_t hdd_ReassocScenario;
- /* PMKID Cache */
- tPmkidCacheInfo PMKIDCache[MAX_PMKSAIDS_IN_CACHE];
- tANI_U32 PMKIDCacheIndex;
};
#define BSS_STOP 0
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index fe49f30..aca63df 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -3276,7 +3276,8 @@
// Finally set the PMKSA ID Cache in CSR
result = sme_RoamSetPMKIDCache(halHandle,pAdapter->sessionId,
PMKIDCache,
- dot11RSNIE.pmkid_count );
+ dot11RSNIE.pmkid_count,
+ FALSE);
}
}
else if (gen_ie[0] == DOT11F_EID_WPA)
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 1c3d228..6c31f3e 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -12385,16 +12385,12 @@
static int __wlan_hdd_cfg80211_set_pmksa(struct wiphy *wiphy, struct net_device *dev,
struct cfg80211_pmksa *pmksa)
{
- tANI_U32 j=0;
hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
- hdd_station_ctx_t *pHddStaCtx;
tHalHandle halHandle;
eHalStatus result;
int status;
- tANI_U8 BSSIDMatched = 0;
hdd_context_t *pHddCtx;
- hddLog(VOS_TRACE_LEVEL_DEBUG, "%s: set PMKSA for " MAC_ADDRESS_STR,
- __func__, MAC_ADDR_ARRAY(pmksa->bssid));
+ tPmkidCacheInfo pmk_id;
// Validate pAdapter
if ( NULL == pAdapter )
@@ -12403,6 +12399,20 @@
return -EINVAL;
}
+ if (!pmksa) {
+ hddLog(LOGE, FL("pmksa is NULL"));
+ return -EINVAL;
+ }
+
+ if (!pmksa->bssid || !pmksa->pmkid) {
+ hddLog(LOGE, FL("pmksa->bssid(%p) or pmksa->pmkid(%p) is NULL"),
+ pmksa->bssid, pmksa->pmkid);
+ return -EINVAL;
+ }
+
+ hddLog(VOS_TRACE_LEVEL_DEBUG, "%s: set PMKSA for " MAC_ADDRESS_STR,
+ __func__, MAC_ADDR_ARRAY(pmksa->bssid));
+
pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
status = wlan_hdd_validate_context(pHddCtx);
@@ -12415,64 +12425,19 @@
// Retrieve halHandle
halHandle = WLAN_HDD_GET_HAL_CTX(pAdapter);
- pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
- for (j = 0; j < pHddStaCtx->PMKIDCacheIndex; j++)
- {
- if (vos_mem_compare(pHddStaCtx->PMKIDCache[j].BSSID,
- pmksa->bssid, WNI_CFG_BSSID_LEN))
- {
- /* BSSID matched previous entry. Overwrite it. */
- BSSIDMatched = 1;
- vos_mem_copy(pHddStaCtx->PMKIDCache[j].BSSID,
- pmksa->bssid, WNI_CFG_BSSID_LEN);
- vos_mem_copy(pHddStaCtx->PMKIDCache[j].PMKID,
- pmksa->pmkid,
- CSR_RSN_PMKID_SIZE);
- hddLog(VOS_TRACE_LEVEL_FATAL, "%s: Reusing cache entry %d.",
- __func__, j );
- dump_bssid(pmksa->bssid);
- dump_pmkid(halHandle, pmksa->pmkid);
- break;
- }
- }
+ vos_mem_copy(pmk_id.BSSID, pmksa->bssid, ETHER_ADDR_LEN);
+ vos_mem_copy(pmk_id.PMKID, pmksa->pmkid, CSR_RSN_PMKID_SIZE);
- /* Check we compared all entries,if then take the first slot now */
- if (j == MAX_PMKSAIDS_IN_CACHE) pHddStaCtx->PMKIDCacheIndex=0;
-
- if (!BSSIDMatched)
- {
- // Now, we DON'T have a BSSID match, so take a new entry in the cache.
- vos_mem_copy(pHddStaCtx->PMKIDCache[pHddStaCtx->PMKIDCacheIndex].BSSID,
- pmksa->bssid, ETHER_ADDR_LEN);
- vos_mem_copy(pHddStaCtx->PMKIDCache[pHddStaCtx->PMKIDCacheIndex].PMKID,
- pmksa->pmkid,
- CSR_RSN_PMKID_SIZE);
- hddLog(VOS_TRACE_LEVEL_DEBUG, "%s: Adding a new cache entry %d.",
- __func__, pHddStaCtx->PMKIDCacheIndex );
- dump_bssid(pmksa->bssid);
- dump_pmkid(halHandle, pmksa->pmkid);
- // Increment the HDD Local Cache index
- // The "i=0" doesn't work for the call to sme_RoamSetPMKIDCache() - LFR FIXME
- if (pHddStaCtx->PMKIDCacheIndex <= (MAX_PMKSAIDS_IN_CACHE-1))
- pHddStaCtx->PMKIDCacheIndex++;
- else
- pHddStaCtx->PMKIDCacheIndex = 0;
- }
-
-
- // Calling csrRoamSetPMKIDCache to configure the PMKIDs into the cache
- hddLog(VOS_TRACE_LEVEL_DEBUG, "%s: Calling csrRoamSetPMKIDCache with %d cache entries.",
- __func__, pHddStaCtx->PMKIDCacheIndex );
-
- // Finally set the PMKSA ID Cache in CSR
+ /* Add to the PMKSA ID Cache in CSR */
result = sme_RoamSetPMKIDCache(halHandle,pAdapter->sessionId,
- pHddStaCtx->PMKIDCache,
- pHddStaCtx->PMKIDCacheIndex);
+ &pmk_id, 1, FALSE);
+
MTRACE(vos_trace(VOS_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_SET_PMKSA,
pAdapter->sessionId, result));
- return 0;
+
+ return HAL_STATUS_SUCCESS(result) ? 0 : -EINVAL;
}
static int wlan_hdd_cfg80211_set_pmksa(struct wiphy *wiphy, struct net_device *dev,
@@ -12491,11 +12456,8 @@
static int __wlan_hdd_cfg80211_del_pmksa(struct wiphy *wiphy, struct net_device *dev,
struct cfg80211_pmksa *pmksa)
{
- tANI_U32 j=0;
hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
- hdd_station_ctx_t *pHddStaCtx;
tHalHandle halHandle;
- tANI_U8 BSSIDMatched = 0;
hdd_context_t *pHddCtx;
int status = 0;
@@ -12509,6 +12471,16 @@
return -EINVAL;
}
+ if (!pmksa) {
+ hddLog(LOGE, FL("pmksa is NULL"));
+ return -EINVAL;
+ }
+
+ if (!pmksa->bssid) {
+ hddLog(LOGE, FL("pmksa->bssid is NULL"));
+ return -EINVAL;
+ }
+
pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
status = wlan_hdd_validate_context(pHddCtx);
@@ -12521,70 +12493,16 @@
/*Retrieve halHandle*/
halHandle = WLAN_HDD_GET_HAL_CTX(pAdapter);
- pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
- /*in case index is 0,no entry to delete*/
- if (0 == pHddStaCtx->PMKIDCacheIndex)
- {
- hddLog(VOS_TRACE_LEVEL_INFO, FL("No entries to flush"));
- return 0;
+ /* Delete the PMKID CSR cache */
+ if (eHAL_STATUS_SUCCESS !=
+ sme_RoamDelPMKIDfromCache(halHandle,
+ pAdapter->sessionId, pmksa->bssid, FALSE)) {
+ hddLog(LOGE, FL("Failed to delete PMKSA for "MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(pmksa->bssid));
+ status = -EINVAL;
}
- /*find the matching PMKSA entry from j=0 to (index-1),
- * and delete the matched one
- */
- for (j = 0; j < pHddStaCtx->PMKIDCacheIndex; j++)
- {
- if (vos_mem_compare(pHddStaCtx->PMKIDCache[j].BSSID,
- pmksa->bssid,
- WNI_CFG_BSSID_LEN))
- {
- /* BSSID matched entry */
- BSSIDMatched = 1;
- if (j < pHddStaCtx->PMKIDCacheIndex-1)
- {
- /*replace the matching entry with the last entry in HDD local cache*/
- vos_mem_copy(pHddStaCtx->PMKIDCache[j].BSSID,
- pHddStaCtx->PMKIDCache[pHddStaCtx->PMKIDCacheIndex-1].BSSID,
- VOS_MAC_ADDR_SIZE);
- vos_mem_copy(pHddStaCtx->PMKIDCache[j].PMKID,
- pHddStaCtx->PMKIDCache[pHddStaCtx->PMKIDCacheIndex-1].PMKID,
- CSR_RSN_PMKID_SIZE);
- }
-
- /*clear the last entry in HDD cache ---[index-1]*/
- vos_mem_zero(pHddStaCtx->PMKIDCache[pHddStaCtx->PMKIDCacheIndex-1].BSSID,
- VOS_MAC_ADDR_SIZE);
- vos_mem_zero(pHddStaCtx->PMKIDCache[pHddStaCtx->PMKIDCacheIndex-1].PMKID,
- CSR_RSN_PMKID_SIZE);
- /*reduce the PMKID array index*/
- pHddStaCtx->PMKIDCacheIndex--;
- /*delete the last PMKID cache in CSR*/
- if (eHAL_STATUS_SUCCESS !=
- sme_RoamDelPMKIDfromCache(halHandle, pAdapter->sessionId, pmksa->bssid))
- {
- hddLog(VOS_TRACE_LEVEL_ERROR,"%s: cannot delete PMKSA %d CONTENT.",
- __func__, pHddStaCtx->PMKIDCacheIndex);
- status = -EINVAL;
- }
-
- dump_bssid(pmksa->bssid);
- dump_pmkid(halHandle,pmksa->pmkid);
-
- break;
- }
- }
-
- /* we compare all entries,but cannot find matching entry */
- if (j == MAX_PMKSAIDS_IN_CACHE && !BSSIDMatched)
- {
- hddLog(VOS_TRACE_LEVEL_FATAL,
- "%s: No such PMKSA entry existed " MAC_ADDRESS_STR,
- __func__, MAC_ADDR_ARRAY(pmksa->bssid));
- dump_bssid(pmksa->bssid);
- dump_pmkid(halHandle, pmksa->pmkid);
- return -EINVAL;
- }
return status;
}
@@ -12604,12 +12522,9 @@
static int __wlan_hdd_cfg80211_flush_pmksa(struct wiphy *wiphy, struct net_device *dev)
{
- tANI_U32 j=0;
hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
- hdd_station_ctx_t *pHddStaCtx;
tHalHandle halHandle;
hdd_context_t *pHddCtx;
- tANI_U8 *pBSSId;
int status = 0;
hddLog(VOS_TRACE_LEVEL_DEBUG, "%s: flushing PMKSA ",__func__);
@@ -12634,33 +12549,14 @@
/*Retrieve halHandle*/
halHandle = WLAN_HDD_GET_HAL_CTX(pAdapter);
- pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
- /*in case index is 0,no entry to delete*/
- if (0 == pHddStaCtx->PMKIDCacheIndex)
- {
- hddLog(VOS_TRACE_LEVEL_ERROR, FL("No entries to flush"));
- return 0;
+ /* Flush the PMKID cache in CSR */
+ if (eHAL_STATUS_SUCCESS !=
+ sme_RoamDelPMKIDfromCache(halHandle, pAdapter->sessionId, NULL, TRUE)) {
+ hddLog(VOS_TRACE_LEVEL_ERROR, FL("Cannot flush PMKIDCache"));
+ status = -EINVAL;
}
- /*delete all the PMKSA one by one */
- for (j = 0; j < pHddStaCtx->PMKIDCacheIndex; j++)
- {
- pBSSId =(tANI_U8 *)(pHddStaCtx->PMKIDCache[j].BSSID);
- /*delete the PMKID in CSR*/
- if (eHAL_STATUS_SUCCESS !=
- sme_RoamDelPMKIDfromCache(halHandle, pAdapter->sessionId, pBSSId))
- {
- hddLog(VOS_TRACE_LEVEL_ERROR ,"%s cannot flush PMKIDCache %d.",
- __func__,j);
- status = -EINVAL;
- }
- /*clear the entry in HDD cache 0--index-1 */
- vos_mem_zero(pHddStaCtx->PMKIDCache[j].BSSID, VOS_MAC_ADDR_SIZE);
- vos_mem_zero(pHddStaCtx->PMKIDCache[j].PMKID, CSR_RSN_PMKID_SIZE);
- }
-
- pHddStaCtx->PMKIDCacheIndex = 0;
return status;
}
diff --git a/CORE/SME/inc/csrApi.h b/CORE/SME/inc/csrApi.h
index b12aab8..178f7c7 100644
--- a/CORE/SME/inc/csrApi.h
+++ b/CORE/SME/inc/csrApi.h
@@ -201,7 +201,7 @@
#define CSR_SCAN_TIME_DEFAULT 0
#define CSR_VALUE_IGNORED 0xFFFFFFFF
#define CSR_RSN_PMKID_SIZE 16
-#define CSR_MAX_PMKID_ALLOWED 16
+#define CSR_MAX_PMKID_ALLOWED 32
#define CSR_WEP40_KEY_LEN 5
#define CSR_WEP104_KEY_LEN 13
#define CSR_TKIP_KEY_LEN 32
diff --git a/CORE/SME/inc/sme_Api.h b/CORE/SME/inc/sme_Api.h
index 317d665..55bffd9 100644
--- a/CORE/SME/inc/sme_Api.h
+++ b/CORE/SME/inc/sme_Api.h
@@ -867,14 +867,19 @@
\param numItems - a variable that has the number of tPmkidCacheInfo
allocated when retruning, this is either the number needed
or number of items put into pPMKIDCache
+ \param update_entire_cache - if TRUE, then it overwrites the entire cache
+ with pPMKIDCache, else it updates entry by
+ entry without deleting the old entries.
\return eHalStatus - when fail, it usually means the buffer allocated is not
big enough and pNumItems has the number of
tPmkidCacheInfo.
\Note: pNumItems is a number of tPmkidCacheInfo,
not sizeof(tPmkidCacheInfo) * something
---------------------------------------------------------------------------*/
-eHalStatus sme_RoamSetPMKIDCache( tHalHandle hHal, tANI_U8 sessionId, tPmkidCacheInfo *pPMKIDCache,
- tANI_U32 numItems );
+eHalStatus sme_RoamSetPMKIDCache( tHalHandle hHal, tANI_U8 sessionId,
+ tPmkidCacheInfo *pPMKIDCache,
+ tANI_U32 numItems,
+ tANI_BOOLEAN update_entire_cache );
/* ---------------------------------------------------------------------------
\fn sme_RoamGetSecurityReqIE
@@ -3338,7 +3343,10 @@
eHalStatus smeIssueFastRoamNeighborAPEvent (tHalHandle hHal,
tANI_U8 *bssid,
tSmeFastRoamTrigger fastRoamTrig);
-eHalStatus sme_RoamDelPMKIDfromCache( tHalHandle hHal, tANI_U8 sessionId, tANI_U8 *pBSSId );
+
+eHalStatus sme_RoamDelPMKIDfromCache( tHalHandle hHal, tANI_U8 sessionId,
+ tANI_U8 *pBSSId,
+ tANI_BOOLEAN flush_cache );
void smeGetCommandQStatus( tHalHandle hHal );
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index a7bce22..3e8fc42 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -12127,19 +12127,22 @@
}
#endif /* FEATURE_WLAN_WAPI */
eHalStatus csrRoamSetPMKIDCache( tpAniSirGlobal pMac, tANI_U32 sessionId,
- tPmkidCacheInfo *pPMKIDCache, tANI_U32 numItems )
+ tPmkidCacheInfo *pPMKIDCache,
+ tANI_U32 numItems,
+ tANI_BOOLEAN update_entire_cache )
{
eHalStatus status = eHAL_STATUS_INVALID_PARAMETER;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
-
- if(!pSession)
+
+ if (!pSession)
{
smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
return eHAL_STATUS_FAILURE;
}
-
+
smsLog(pMac, LOGW, "csrRoamSetPMKIDCache called, numItems = %d", numItems);
- if(numItems <= CSR_MAX_PMKID_ALLOWED)
+
+ if (numItems <= CSR_MAX_PMKID_ALLOWED)
{
#ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR
{
@@ -12158,51 +12161,102 @@
}
#endif//FEATURE_WLAN_DIAG_SUPPORT_CSR
status = eHAL_STATUS_SUCCESS;
- //numItems may be 0 to clear the cache
- pSession->NumPmkidCache = (tANI_U16)numItems;
- if(numItems && pPMKIDCache)
- {
- vos_mem_copy(pSession->PmkidCacheInfo, pPMKIDCache,
- sizeof(tPmkidCacheInfo) * numItems);
- status = eHAL_STATUS_SUCCESS;
+ if (update_entire_cache) {
+ pSession->NumPmkidCache = (tANI_U16)numItems;
+ if (numItems && pPMKIDCache)
+ {
+ vos_mem_copy(pSession->PmkidCacheInfo, pPMKIDCache,
+ sizeof(tPmkidCacheInfo) * numItems);
+ }
+ } else {
+ tANI_U32 i = 0, j = 0;
+ tANI_U8 BSSIDMatched = 0;
+ tPmkidCacheInfo *pmksa;
+
+ for (i = 0; i < numItems; i++) {
+ pmksa = &pPMKIDCache[i];
+ for (j = 0; j < CSR_MAX_PMKID_ALLOWED; j++) {
+ if (vos_mem_compare(pSession->PmkidCacheInfo[j].BSSID,
+ pmksa->BSSID, VOS_MAC_ADDR_SIZE)) {
+ /* If a matching BSSID found, update it */
+ BSSIDMatched = 1;
+ vos_mem_copy(pSession->PmkidCacheInfo[j].PMKID,
+ pmksa->PMKID, CSR_RSN_PMKID_SIZE);
+ break;
+ }
+ }
+
+ if (!BSSIDMatched) {
+ vos_mem_copy(
+ pSession->PmkidCacheInfo[pSession->NumPmkidCache].BSSID,
+ pmksa->BSSID, VOS_MAC_ADDR_SIZE);
+ vos_mem_copy(
+ pSession->PmkidCacheInfo[pSession->NumPmkidCache].PMKID,
+ pmksa->PMKID, CSR_RSN_PMKID_SIZE);
+ /* Increment the CSR local cache index */
+ if (pSession->NumPmkidCache < (CSR_MAX_PMKID_ALLOWED - 1))
+ pSession->NumPmkidCache++;
+ else
+ pSession->NumPmkidCache = 0;
+ }
+ BSSIDMatched = 0;
+ }
}
}
return (status);
}
eHalStatus csrRoamDelPMKIDfromCache( tpAniSirGlobal pMac, tANI_U32 sessionId,
- tANI_U8 *pBSSId )
+ tANI_U8 *pBSSId,
+ tANI_BOOLEAN flush_cache )
{
eHalStatus status = eHAL_STATUS_FAILURE;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
tANI_BOOLEAN fMatchFound = FALSE;
tANI_U32 Index;
+
if(!pSession)
{
smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
return eHAL_STATUS_FAILURE;
}
- do
- {
- for( Index=0; Index < pSession->NumPmkidCache; Index++ )
- {
- smsLog(pMac, LOGW, "Delete PMKID for "
- MAC_ADDRESS_STR, MAC_ADDR_ARRAY(pBSSId));
- if( vos_mem_compare( pBSSId, pSession->PmkidCacheInfo[Index].BSSID, sizeof(tCsrBssid) ) )
- {
- fMatchFound = TRUE;
+
+ /* Check if there are no entries to delete */
+ if (0 == pSession->NumPmkidCache) {
+ smsLog(pMac, LOG1, FL("No entries to delete/Flush"));
+ return eHAL_STATUS_SUCCESS;
+ }
+
+ if (!flush_cache) {
+ for (Index = 0; Index < CSR_MAX_PMKID_ALLOWED; Index++) {
+ if (vos_mem_compare(pSession->PmkidCacheInfo[Index].BSSID,
+ pBSSId, VOS_MAC_ADDR_SIZE)) {
+ fMatchFound = 1;
+
+ /* Clear this - the matched entry */
+ vos_mem_zero(&pSession->PmkidCacheInfo[Index],
+ sizeof(tPmkidCacheInfo));
+ status = eHAL_STATUS_SUCCESS;
break;
}
}
- if( !fMatchFound ) break;
- vos_mem_set(pSession->PmkidCacheInfo[Index].BSSID, sizeof(tCsrBssid), 0);
- status = eHAL_STATUS_SUCCESS;
+
+ if (Index == CSR_MAX_PMKID_ALLOWED && !fMatchFound) {
+ smsLog(pMac, LOG1, FL("No such PMKSA entry exists "MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(pBSSId));
+ return status;
+ }
+
+ return status;
+ } else {
+ /* Flush the entire cache */
+ vos_mem_zero(pSession->PmkidCacheInfo,
+ sizeof(tPmkidCacheInfo) * CSR_MAX_PMKID_ALLOWED);
+ pSession->NumPmkidCache = 0;
+ return eHAL_STATUS_SUCCESS;
}
- while( 0 );
- smsLog(pMac, LOGW, "csrDelPMKID called return match = %d Status = %d",
- fMatchFound, status);
- return status;
}
+
tANI_U32 csrRoamGetNumPMKIDCache(tpAniSirGlobal pMac, tANI_U32 sessionId)
{
return (pMac->roam.roamSession[sessionId].NumPmkidCache);
diff --git a/CORE/SME/src/csr/csrInsideApi.h b/CORE/SME/src/csr/csrInsideApi.h
index 167e05c..d05a987 100644
--- a/CORE/SME/src/csr/csrInsideApi.h
+++ b/CORE/SME/src/csr/csrInsideApi.h
@@ -748,7 +748,10 @@
has the number of tPmkidCacheInfo.
\Note: pNumItems is a number of tPmkidCacheInfo, not sizeof(tPmkidCacheInfo) * something
-------------------------------------------------------------------------------*/
-eHalStatus csrRoamSetPMKIDCache( tpAniSirGlobal pMac, tANI_U32 sessionId, tPmkidCacheInfo *pPMKIDCache, tANI_U32 numItems );
+eHalStatus csrRoamSetPMKIDCache( tpAniSirGlobal pMac, tANI_U32 sessionId,
+ tPmkidCacheInfo *pPMKIDCache,
+ tANI_U32 numItems,
+ tANI_BOOLEAN update_entire_cache );
/* ---------------------------------------------------------------------------
\fn csrRoamGetWpaRsnReqIE
@@ -997,7 +1000,7 @@
eHalStatus csrUpdateChannelList(tpAniSirGlobal pMac);
eHalStatus csrRoamDelPMKIDfromCache( tpAniSirGlobal pMac, tANI_U32 sessionId,
- tANI_U8 *pBSSId );
+ tANI_U8 *pBSSId, tANI_BOOLEAN flush_cache );
tANI_BOOLEAN csrElectedCountryInfo(tpAniSirGlobal pMac);
void csrAddVoteForCountryInfo(tpAniSirGlobal pMac, tANI_U8 *pCountryCode);
void csrClearVotesForCountryInfo(tpAniSirGlobal pMac);
diff --git a/CORE/SME/src/csr/csrUtil.c b/CORE/SME/src/csr/csrUtil.c
index 4f8bc64..01086a3 100644
--- a/CORE/SME/src/csr/csrUtil.c
+++ b/CORE/SME/src/csr/csrUtil.c
@@ -3877,10 +3877,8 @@
do
{
- for( Index=0; Index < pSession->NumPmkidCache; Index++ )
+ for( Index=0; Index < CSR_MAX_PMKID_ALLOWED; Index++ )
{
- smsLog(pMac, LOGW, "match PMKID "MAC_ADDRESS_STR " to ",
- MAC_ADDR_ARRAY(pBSSId));
if( vos_mem_compare(pBSSId, pSession->PmkidCacheInfo[Index].BSSID, sizeof(tCsrBssid)) )
{
// match found
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index 7c182d7..bfb4583 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -3479,14 +3479,19 @@
\param numItems - a variable that has the number of tPmkidCacheInfo
allocated when retruning, this is either the number needed
or number of items put into pPMKIDCache
+ \param update_entire_cache - this bool value specifies if the entire pmkid
+ cache should be overwritten or should it be
+ updated entry by entry.
\return eHalStatus - when fail, it usually means the buffer allocated is not
big enough and pNumItems has the number of
tPmkidCacheInfo.
\Note: pNumItems is a number of tPmkidCacheInfo,
not sizeof(tPmkidCacheInfo) * something
---------------------------------------------------------------------------*/
-eHalStatus sme_RoamSetPMKIDCache( tHalHandle hHal, tANI_U8 sessionId, tPmkidCacheInfo *pPMKIDCache,
- tANI_U32 numItems )
+eHalStatus sme_RoamSetPMKIDCache( tHalHandle hHal, tANI_U8 sessionId,
+ tPmkidCacheInfo *pPMKIDCache,
+ tANI_U32 numItems,
+ tANI_BOOLEAN update_entire_cache )
{
eHalStatus status = eHAL_STATUS_FAILURE;
tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
@@ -3498,7 +3503,8 @@
{
if( CSR_IS_SESSION_VALID( pMac, sessionId ) )
{
- status = csrRoamSetPMKIDCache( pMac, sessionId, pPMKIDCache, numItems );
+ status = csrRoamSetPMKIDCache( pMac, sessionId, pPMKIDCache,
+ numItems, update_entire_cache );
}
else
{
@@ -3510,7 +3516,9 @@
return (status);
}
-eHalStatus sme_RoamDelPMKIDfromCache( tHalHandle hHal, tANI_U8 sessionId, tANI_U8 *pBSSId )
+eHalStatus sme_RoamDelPMKIDfromCache( tHalHandle hHal, tANI_U8 sessionId,
+ tANI_U8 *pBSSId,
+ tANI_BOOLEAN flush_cache )
{
eHalStatus status = eHAL_STATUS_FAILURE;
tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
@@ -3519,7 +3527,8 @@
{
if( CSR_IS_SESSION_VALID( pMac, sessionId ) )
{
- status = csrRoamDelPMKIDfromCache( pMac, sessionId, pBSSId );
+ status = csrRoamDelPMKIDfromCache( pMac, sessionId,
+ pBSSId, flush_cache );
}
else
{