summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkrunal soni <ksoni@qca.qualcomm.com>2014-02-10 16:19:20 -0800
committerAkash Patel <c_akashp@qca.qualcomm.com>2014-03-03 10:38:28 -0800
commitd01b837bedb9774d351a56ac788937266e83f620 (patch)
tree052e789ff5b8cbbe74bab00a134753b98c503a6a
parent35148d261f442dc5e7563be430cbe5082716f90c (diff)
wlan: Fix for 32bit to 64bit conversion issue in csrCheckValidateLists
there is a 64-bit issue, but that the code is actually obsolete so we're completely removing the csrCheckValidateLists() functionality Change-Id: I839d0f333f52e123693e210881e6da0074d48e48 CRs-Fixed: 582144
-rw-r--r--CORE/SME/src/csr/csrApiScan.c84
-rw-r--r--CORE/VOSS/src/vos_memory.c8
2 files changed, 0 insertions, 92 deletions
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index 1fe12364d7fd..37035634c92d 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -50,16 +50,10 @@
#include "vos_nvitem.h"
#include "wlan_qct_wda.h"
-#define CSR_VALIDATE_LIST //This portion of code need to be removed once the issue is resolved.
#define MIN_CHN_TIME_TO_FIND_GO 100
#define MAX_CHN_TIME_TO_FIND_GO 100
#define DIRECT_SSID_LEN 7
-#ifdef CSR_VALIDATE_LIST
-tDblLinkList *g_pchannelPowerInfoList24 = NULL, * g_pchannelPowerInfoList5 = NULL;
-tpAniSirGlobal g_pMac;
-#endif
-
/* Purpose of HIDDEN_TIMER
** When we remove hidden ssid from the profile i.e., forget the SSID via GUI that SSID shouldn't see in the profile
** For above requirement we used timer limit, logic is explained below
@@ -210,74 +204,6 @@ static eHalStatus csrLLScanPurgeResult(tpAniSirGlobal pMac, tDblLinkList *pList)
return (status);
}
-#ifdef CSR_VALIDATE_LIST
-static int validateList(tDblLinkList *pChannelPwrList, int idx)
-{
- tListElem *pElem, *pHead;
- int count;
-
- if(!pChannelPwrList)
- {
- return 1;
- }
-
- count = (int)(pChannelPwrList->Count);
- pHead = &pChannelPwrList->ListHead;
- pElem = pHead->next;
- if((tANI_U32)(pHead->next) > 0x00010000) //Assuming kernel address is not that low.
- {
- //this loop crashes if the pointer is not right
- while(pElem->next != pHead)
- {
- if((tANI_U32)(pElem->next) > 0x00010000)
- {
- pElem = pElem->next;
- if (count <=0)
- {
- VOS_BUG(count > 0);
- return 0;
- }
- count--;
- }
- else
- {
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL, "%d Detect list(0x%X) error Head(0x%X) next(0x%X) Count %d",
- idx, (unsigned int)pChannelPwrList, (unsigned int)pHead,
- (unsigned int)(pHead->next), (int)pChannelPwrList->Count);
- VOS_BUG(0);
- return 0;
- }
- }
- }
- else
- {
- //Bad list
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL, "%d Detect list(0x%X) error Head(0x%X) next(0x%X) Count %d",
- idx, (unsigned int)pChannelPwrList, (unsigned int)pHead,
- (unsigned int)(pHead->next), (int)pChannelPwrList->Count);
- VOS_BUG(0);
- return 0;
- }
- return 1;
-}
-#endif
-
-int csrCheckValidateLists(void * dest, const void *src, v_SIZE_t num, int idx)
-{
-#ifdef CSR_VALIDATE_LIST
- if( (NULL == g_pMac) || (!g_pMac->scan.fValidateList ) )
- {
- return 1;
- }
-
- return (validateList(g_pchannelPowerInfoList24, idx) &&
- validateList(g_pchannelPowerInfoList5, idx)) ? 1 : 0;
-#else
- return 1;
-#endif //#ifdef CSR_VALIDATE_LIST
-}
-
-
eHalStatus csrScanOpen( tpAniSirGlobal pMac )
{
eHalStatus status;
@@ -291,11 +217,6 @@ eHalStatus csrScanOpen( tpAniSirGlobal pMac )
#ifdef WLAN_AP_STA_CONCURRENCY
csrLLOpen(pMac->hHdd, &pMac->scan.scanCmdPendingList);
#endif
-#ifdef CSR_VALIDATE_LIST
- g_pchannelPowerInfoList5 = &pMac->scan.channelPowerInfoList5G;
- g_pMac = pMac;
- g_pchannelPowerInfoList24 = &pMac->scan.channelPowerInfoList24;
-#endif
pMac->scan.fFullScanIssued = eANI_BOOLEAN_FALSE;
pMac->scan.nBssLimit = CSR_MAX_BSS_SUPPORT;
status = vos_timer_init(&pMac->scan.hTimerGetResult, VOS_TIMER_TYPE_SW, csrScanGetResultTimerHandler, pMac);
@@ -339,11 +260,6 @@ eHalStatus csrScanOpen( tpAniSirGlobal pMac )
eHalStatus csrScanClose( tpAniSirGlobal pMac )
{
-#ifdef CSR_VALIDATE_LIST
- g_pchannelPowerInfoList24 = NULL;
- g_pchannelPowerInfoList5 = NULL;
- g_pMac = NULL;
-#endif
csrLLScanPurgeResult(pMac, &pMac->scan.tempScanResults);
csrLLScanPurgeResult(pMac, &pMac->scan.scanResultList);
#ifdef WLAN_AP_STA_CONCURRENCY
diff --git a/CORE/VOSS/src/vos_memory.c b/CORE/VOSS/src/vos_memory.c
index edc4817a3c9f..56be95be94e0 100644
--- a/CORE/VOSS/src/vos_memory.c
+++ b/CORE/VOSS/src/vos_memory.c
@@ -337,11 +337,6 @@ v_VOID_t vos_mem_zero( v_VOID_t *ptr, v_SIZE_t numBytes )
}
-
-//This function is to validate one list in SME. We suspect someone corrupt te list. This code need to be removed
-//once the issue is fixed.
-extern int csrCheckValidateLists(void * dest, const void *src, v_SIZE_t num, int idx);
-
v_VOID_t vos_mem_copy( v_VOID_t *pDst, const v_VOID_t *pSrc, v_SIZE_t numBytes )
{
if (0 == numBytes)
@@ -358,10 +353,7 @@ v_VOID_t vos_mem_copy( v_VOID_t *pDst, const v_VOID_t *pSrc, v_SIZE_t numBytes )
VOS_ASSERT(0);
return;
}
- //These two check function calls are to see if someone corrupt the list while doing mem copy.
- csrCheckValidateLists(pDst, pSrc, numBytes, 1);
memcpy(pDst, pSrc, numBytes);
- csrCheckValidateLists(pDst, pSrc, numBytes, 2);
}
v_VOID_t vos_mem_move( v_VOID_t *pDst, const v_VOID_t *pSrc, v_SIZE_t numBytes )