wlan: Reduce size of PNO command in SME command list
SME PNO command arguments has statically allocated memory,
because of this SME command list size has increased which
is leading to memory exhaustion.
Hence make PNO command arguments as pointers.
Change-Id: I9bac3871944fd08a4e56bfd4c354aec757f46973
CRs-Fixed: 798854
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 20bb1c2..f139439 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -13360,7 +13360,7 @@
struct net_device *dev, struct cfg80211_sched_scan_request *request)
{
hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
- tpSirPNOScanReq pPnoRequest = NULL;
+ tSirPNOScanReq pnoRequest = {0};
hdd_context_t *pHddCtx;
tHalHandle hHal;
v_U32_t i, indx, num_ch, tempInterval, j;
@@ -13429,25 +13429,15 @@
pHddCtx->isPnoEnable = TRUE;
- pPnoRequest = (tpSirPNOScanReq) vos_mem_malloc(sizeof (tSirPNOScanReq));
- if (NULL == pPnoRequest)
- {
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
- "%s: vos_mem_malloc failed", __func__);
- pHddCtx->isPnoEnable = FALSE;
- return -ENOMEM;
- }
+ pnoRequest.enable = 1; /*Enable PNO */
+ pnoRequest.ucNetworksCount = request->n_match_sets;
- memset(pPnoRequest, 0, sizeof (tSirPNOScanReq));
- pPnoRequest->enable = 1; /*Enable PNO */
- pPnoRequest->ucNetworksCount = request->n_match_sets;
-
- if (( !pPnoRequest->ucNetworksCount ) ||
- ( pPnoRequest->ucNetworksCount > SIR_PNO_MAX_SUPP_NETWORKS ))
+ if (( !pnoRequest.ucNetworksCount ) ||
+ ( pnoRequest.ucNetworksCount > SIR_PNO_MAX_SUPP_NETWORKS ))
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
"%s: Network input is not correct %d Max Network supported is %d",
- __func__, pPnoRequest->ucNetworksCount,
+ __func__, pnoRequest.ucNetworksCount,
SIR_PNO_MAX_SUPP_NETWORKS);
ret = -EINVAL;
goto error;
@@ -13512,51 +13502,64 @@
goto error;
}
}
- /* Filling per profile params */
- for (i = 0; i < pPnoRequest->ucNetworksCount; i++)
+
+ pnoRequest.aNetworks =
+ vos_mem_malloc(sizeof(tSirNetworkType)*pnoRequest.ucNetworksCount);
+ if (pnoRequest.aNetworks == NULL)
{
- pPnoRequest->aNetworks[i].ssId.length =
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
+ FL("failed to allocate memory aNetworks %u"),
+ (uint32)sizeof(tSirNetworkType)*pnoRequest.ucNetworksCount);
+ goto error;
+ }
+ vos_mem_zero(pnoRequest.aNetworks,
+ sizeof(tSirNetworkType)*pnoRequest.ucNetworksCount);
+
+ /* Filling per profile params */
+ for (i = 0; i < pnoRequest.ucNetworksCount; i++)
+ {
+ pnoRequest.aNetworks[i].ssId.length =
request->match_sets[i].ssid.ssid_len;
- if (( 0 == pPnoRequest->aNetworks[i].ssId.length ) ||
- ( pPnoRequest->aNetworks[i].ssId.length > 32 ) )
+ if (( 0 == pnoRequest.aNetworks[i].ssId.length ) ||
+ ( pnoRequest.aNetworks[i].ssId.length > 32 ) )
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
"%s: SSID Len %d is not correct for network %d",
- __func__, pPnoRequest->aNetworks[i].ssId.length, i);
+ __func__, pnoRequest.aNetworks[i].ssId.length, i);
ret = -EINVAL;
goto error;
}
- memcpy(pPnoRequest->aNetworks[i].ssId.ssId,
+ memcpy(pnoRequest.aNetworks[i].ssId.ssId,
request->match_sets[i].ssid.ssid,
request->match_sets[i].ssid.ssid_len);
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
"%s: SSID of network %d is %s ", __func__,
- i, pPnoRequest->aNetworks[i].ssId.ssId);
- pPnoRequest->aNetworks[i].authentication = 0; /*eAUTH_TYPE_ANY*/
- pPnoRequest->aNetworks[i].encryption = 0; /*eED_ANY*/
- pPnoRequest->aNetworks[i].bcastNetwType = 0; /*eBCAST_UNKNOWN*/
+ i, pnoRequest.aNetworks[i].ssId.ssId);
+ pnoRequest.aNetworks[i].authentication = 0; /*eAUTH_TYPE_ANY*/
+ pnoRequest.aNetworks[i].encryption = 0; /*eED_ANY*/
+ pnoRequest.aNetworks[i].bcastNetwType = 0; /*eBCAST_UNKNOWN*/
/*Copying list of valid channel into request */
- memcpy(pPnoRequest->aNetworks[i].aChannels, valid_ch, num_ch);
- pPnoRequest->aNetworks[i].ucChannelCount = num_ch;
+ memcpy(pnoRequest.aNetworks[i].aChannels, valid_ch, num_ch);
+ pnoRequest.aNetworks[i].ucChannelCount = num_ch;
- pPnoRequest->aNetworks[i].rssiThreshold = 0; //Default value
+ pnoRequest.aNetworks[i].rssiThreshold = 0; //Default value
}
for (i = 0; i < request->n_ssids; i++)
{
j = 0;
- while (j < pPnoRequest->ucNetworksCount)
+ while (j < pnoRequest.ucNetworksCount)
{
- if ((pPnoRequest->aNetworks[j].ssId.length ==
+ if ((pnoRequest.aNetworks[j].ssId.length ==
request->ssids[i].ssid_len) &&
- (0 == memcmp(pPnoRequest->aNetworks[j].ssId.ssId,
+ (0 == memcmp(pnoRequest.aNetworks[j].ssId.ssId,
request->ssids[i].ssid,
- pPnoRequest->aNetworks[j].ssId.length)))
+ pnoRequest.aNetworks[j].ssId.length)))
{
- pPnoRequest->aNetworks[j].bcastNetwType = eBCAST_HIDDEN;
+ pnoRequest.aNetworks[j].bcastNetwType = eBCAST_HIDDEN;
break;
}
j++;
@@ -13567,15 +13570,37 @@
request->n_ssids);
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
"request->ie_len = %zu", request->ie_len);
+
+ pnoRequest.p24GProbeTemplate = vos_mem_malloc(SIR_PNO_MAX_PB_REQ_SIZE);
+ if (pnoRequest.p24GProbeTemplate == NULL)
+ {
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
+ FL("failed to allocate memory p24GProbeTemplate %u"),
+ SIR_PNO_MAX_PB_REQ_SIZE);
+ goto error;
+ }
+
+ pnoRequest.p5GProbeTemplate = vos_mem_malloc(SIR_PNO_MAX_PB_REQ_SIZE);
+ if (pnoRequest.p5GProbeTemplate == NULL)
+ {
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
+ FL("failed to allocate memory p5GProbeTemplate %u"),
+ SIR_PNO_MAX_PB_REQ_SIZE);
+ goto error;
+ }
+
+ vos_mem_zero(pnoRequest.p24GProbeTemplate, SIR_PNO_MAX_PB_REQ_SIZE);
+ vos_mem_zero(pnoRequest.p5GProbeTemplate, SIR_PNO_MAX_PB_REQ_SIZE);
+
if ((0 < request->ie_len) && (NULL != request->ie))
{
- pPnoRequest->us24GProbeTemplateLen = request->ie_len;
- memcpy(&pPnoRequest->p24GProbeTemplate, request->ie,
- pPnoRequest->us24GProbeTemplateLen);
+ pnoRequest.us24GProbeTemplateLen = request->ie_len;
+ memcpy(pnoRequest.p24GProbeTemplate, request->ie,
+ pnoRequest.us24GProbeTemplateLen);
- pPnoRequest->us5GProbeTemplateLen = request->ie_len;
- memcpy(&pPnoRequest->p5GProbeTemplate, request->ie,
- pPnoRequest->us5GProbeTemplateLen);
+ pnoRequest.us5GProbeTemplateLen = request->ie_len;
+ memcpy(pnoRequest.p5GProbeTemplate, request->ie,
+ pnoRequest.us5GProbeTemplateLen);
}
/* Driver gets only one time interval which is hardcoded in
@@ -13588,39 +13613,39 @@
* till PNO is disabled.
*/
if (0 == pHddCtx->cfg_ini->configPNOScanTimerRepeatValue)
- pPnoRequest->scanTimers.ucScanTimersCount = HDD_PNO_SCAN_TIMERS_SET_ONE;
+ pnoRequest.scanTimers.ucScanTimersCount = HDD_PNO_SCAN_TIMERS_SET_ONE;
else
- pPnoRequest->scanTimers.ucScanTimersCount =
+ pnoRequest.scanTimers.ucScanTimersCount =
HDD_PNO_SCAN_TIMERS_SET_MULTIPLE;
tempInterval = (request->interval)/1000;
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
"Base scan interval = %d PNOScanTimerRepeatValue = %d",
tempInterval, pHddCtx->cfg_ini->configPNOScanTimerRepeatValue);
- for ( i = 0; i < pPnoRequest->scanTimers.ucScanTimersCount; i++)
+ for ( i = 0; i < pnoRequest.scanTimers.ucScanTimersCount; i++)
{
- pPnoRequest->scanTimers.aTimerValues[i].uTimerRepeat =
+ pnoRequest.scanTimers.aTimerValues[i].uTimerRepeat =
pHddCtx->cfg_ini->configPNOScanTimerRepeatValue;
- pPnoRequest->scanTimers.aTimerValues[i].uTimerValue = tempInterval;
+ pnoRequest.scanTimers.aTimerValues[i].uTimerValue = tempInterval;
tempInterval *= 2;
}
//Repeat last timer until pno disabled.
- pPnoRequest->scanTimers.aTimerValues[i-1].uTimerRepeat = 0;
+ pnoRequest.scanTimers.aTimerValues[i-1].uTimerRepeat = 0;
- pPnoRequest->modePNO = SIR_PNO_MODE_IMMEDIATE;
+ pnoRequest.modePNO = SIR_PNO_MODE_IMMEDIATE;
INIT_COMPLETION(pAdapter->pno_comp_var);
- pPnoRequest->statusCallback = hdd_cfg80211_sched_scan_start_status_cb;
- pPnoRequest->callbackContext = pAdapter;
+ pnoRequest.statusCallback = hdd_cfg80211_sched_scan_start_status_cb;
+ pnoRequest.callbackContext = pAdapter;
pAdapter->pno_req_status = 0;
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
"SessionId %d, enable %d, modePNO %d, ucScanTimersCount %d",
- pAdapter->sessionId, pPnoRequest->enable, pPnoRequest->modePNO,
- pPnoRequest->scanTimers.ucScanTimersCount);
+ pAdapter->sessionId, pnoRequest.enable, pnoRequest.modePNO,
+ pnoRequest.scanTimers.ucScanTimersCount);
status = sme_SetPreferredNetworkList(WLAN_HDD_GET_HAL_CTX(pAdapter),
- pPnoRequest, pAdapter->sessionId,
+ &pnoRequest, pAdapter->sessionId,
hdd_cfg80211_sched_scan_done_callback, pAdapter);
if (eHAL_STATUS_SUCCESS != status)
{
@@ -13645,15 +13670,19 @@
goto error;
}
- vos_mem_free(pPnoRequest);
ret = pAdapter->pno_req_status;
return ret;
error:
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
FL("PNO scanRequest offloaded ret = %d"), ret);
- vos_mem_free(pPnoRequest);
pHddCtx->isPnoEnable = FALSE;
+ if (pnoRequest.aNetworks)
+ vos_mem_free(pnoRequest.aNetworks);
+ if (pnoRequest.p24GProbeTemplate)
+ vos_mem_free(pnoRequest.p24GProbeTemplate);
+ if (pnoRequest.p5GProbeTemplate)
+ vos_mem_free(pnoRequest.p5GProbeTemplate);
return ret;
}
@@ -13684,7 +13713,7 @@
hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
hdd_context_t *pHddCtx;
tHalHandle hHal;
- tpSirPNOScanReq pPnoRequest = NULL;
+ tSirPNOScanReq pnoRequest = {0};
int ret = 0;
ENTER();
@@ -13736,19 +13765,10 @@
return -EINVAL;
}
- pPnoRequest = (tpSirPNOScanReq) vos_mem_malloc(sizeof (tSirPNOScanReq));
- if (NULL == pPnoRequest)
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
- "%s: vos_mem_malloc failed", __func__);
- return -ENOMEM;
- }
+ pnoRequest.enable = 0; /* Disable PNO */
+ pnoRequest.ucNetworksCount = 0;
- memset(pPnoRequest, 0, sizeof (tSirPNOScanReq));
- pPnoRequest->enable = 0; /* Disable PNO */
- pPnoRequest->ucNetworksCount = 0;
-
- status = sme_SetPreferredNetworkList(hHal, pPnoRequest,
+ status = sme_SetPreferredNetworkList(hHal, &pnoRequest,
pAdapter->sessionId,
NULL, pAdapter);
if (eHAL_STATUS_SUCCESS != status)
@@ -13763,7 +13783,6 @@
error:
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
FL("PNO scan disabled ret = %d"), ret);
- vos_mem_free(pPnoRequest);
EXIT();
return ret;
diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c
index ae175ab..101f84f 100644
--- a/CORE/HDD/src/wlan_hdd_wext.c
+++ b/CORE/HDD/src/wlan_hdd_wext.c
@@ -7760,7 +7760,7 @@
overflow. This API is only invoked via ioctl, so it is
serialized by the kernel rtnl_lock and hence does not need to be
reentrant */
- static tSirPNOScanReq pnoRequest;
+ tSirPNOScanReq pnoRequest = {0};
char *ptr;
v_U8_t i,j, ucParams, ucMode;
eHalStatus status = eHAL_STATUS_FAILURE;
@@ -7868,6 +7868,18 @@
ptr += nOffset;
+ pnoRequest.aNetworks =
+ vos_mem_malloc(sizeof(tSirNetworkType)*pnoRequest.ucNetworksCount);
+ if (pnoRequest.aNetworks == NULL)
+ {
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
+ FL("failed to allocate memory aNetworks %u"),
+ (uint32)sizeof(tSirNetworkType)*pnoRequest.ucNetworksCount);
+ goto error;
+ }
+ vos_mem_zero(pnoRequest.aNetworks,
+ sizeof(tSirNetworkType)*pnoRequest.ucNetworksCount);
+
for ( i = 0; i < pnoRequest.ucNetworksCount; i++ )
{
@@ -8054,6 +8066,24 @@
{
pnoRequest.modePNO = SIR_PNO_MODE_ON_SUSPEND;
}
+ pnoRequest.p24GProbeTemplate = vos_mem_malloc(SIR_PNO_MAX_PB_REQ_SIZE);
+ if (pnoRequest.p24GProbeTemplate == NULL){
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
+ FL("failed to allocate memory p24GProbeTemplate %u"),
+ SIR_PNO_MAX_PB_REQ_SIZE);
+ goto error;
+ }
+
+ pnoRequest.p5GProbeTemplate = vos_mem_malloc(SIR_PNO_MAX_PB_REQ_SIZE);
+ if (pnoRequest.p5GProbeTemplate == NULL){
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
+ FL("failed to allocate memory p5GProbeTemplate %u"),
+ SIR_PNO_MAX_PB_REQ_SIZE);
+ goto error;
+ }
+
+ vos_mem_zero(pnoRequest.p24GProbeTemplate, SIR_PNO_MAX_PB_REQ_SIZE);
+ vos_mem_zero(pnoRequest.p5GProbeTemplate, SIR_PNO_MAX_PB_REQ_SIZE);
status = sme_SetPreferredNetworkList(WLAN_HDD_GET_HAL_CTX(pAdapter), &pnoRequest,
pAdapter->sessionId,
@@ -8068,6 +8098,12 @@
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
"%s: Failed to enable PNO", __func__);
pHddCtx->isPnoEnable = FALSE;
+ if (pnoRequest.aNetworks)
+ vos_mem_free(pnoRequest.aNetworks);
+ if (pnoRequest.p24GProbeTemplate)
+ vos_mem_free(pnoRequest.p24GProbeTemplate);
+ if (pnoRequest.p5GProbeTemplate)
+ vos_mem_free(pnoRequest.p5GProbeTemplate);
return VOS_STATUS_E_FAILURE;
}/*iw_set_pno*/
diff --git a/CORE/MAC/inc/sirApi.h b/CORE/MAC/inc/sirApi.h
index 7f4eb8e..0d92438 100644
--- a/CORE/MAC/inc/sirApi.h
+++ b/CORE/MAC/inc/sirApi.h
@@ -3740,14 +3740,14 @@
void *callbackContext;
eSirPNOMode modePNO;
tANI_U8 ucNetworksCount;
- tSirNetworkType aNetworks[SIR_PNO_MAX_SUPP_NETWORKS];
+ tSirNetworkType *aNetworks;
tSirScanTimersType scanTimers;
/*added by SME*/
tANI_U16 us24GProbeTemplateLen;
- tANI_U8 p24GProbeTemplate[SIR_PNO_MAX_PB_REQ_SIZE];
+ tANI_U8 *p24GProbeTemplate;
tANI_U16 us5GProbeTemplateLen;
- tANI_U8 p5GProbeTemplate[SIR_PNO_MAX_PB_REQ_SIZE];
+ tANI_U8 *p5GProbeTemplate;
} tSirPNOScanReq, *tpSirPNOScanReq;
typedef struct sSirSetRSSIFilterReq
diff --git a/CORE/SME/src/pmc/pmcApi.c b/CORE/SME/src/pmc/pmcApi.c
index 11b381f..b933999 100644
--- a/CORE/SME/src/pmc/pmcApi.c
+++ b/CORE/SME/src/pmc/pmcApi.c
@@ -2959,97 +2959,77 @@
smsLog( pMac, LOGE, FL(" fail to get command buffer") );
return eHAL_STATUS_RESOURCES;
}
-
- VOS_TRACE( VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
- "%s: SSID = 0x%08x%08x%08x%08x%08x%08x%08x%08x, "
- "0x%08x%08x%08x%08x%08x%08x%08x%08x", __func__,
- *((v_U32_t *) &pRequest->aNetworks[0].ssId.ssId[0]),
- *((v_U32_t *) &pRequest->aNetworks[0].ssId.ssId[4]),
- *((v_U32_t *) &pRequest->aNetworks[0].ssId.ssId[8]),
- *((v_U32_t *) &pRequest->aNetworks[0].ssId.ssId[12]),
- *((v_U32_t *) &pRequest->aNetworks[0].ssId.ssId[16]),
- *((v_U32_t *) &pRequest->aNetworks[0].ssId.ssId[20]),
- *((v_U32_t *) &pRequest->aNetworks[0].ssId.ssId[24]),
- *((v_U32_t *) &pRequest->aNetworks[0].ssId.ssId[28]),
- *((v_U32_t *) &pRequest->aNetworks[1].ssId.ssId[0]),
- *((v_U32_t *) &pRequest->aNetworks[1].ssId.ssId[4]),
- *((v_U32_t *) &pRequest->aNetworks[1].ssId.ssId[8]),
- *((v_U32_t *) &pRequest->aNetworks[1].ssId.ssId[12]),
- *((v_U32_t *) &pRequest->aNetworks[1].ssId.ssId[16]),
- *((v_U32_t *) &pRequest->aNetworks[1].ssId.ssId[20]),
- *((v_U32_t *) &pRequest->aNetworks[1].ssId.ssId[24]),
- *((v_U32_t *) &pRequest->aNetworks[1].ssId.ssId[28]));
- if (!pSession)
- {
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
- "%s: pSessionis NULL", __func__);
- return eHAL_STATUS_FAILURE;
- }
-
pRequestBuf = &(pCommand->u.pnoInfo);
-
vos_mem_copy(pRequestBuf, pRequest, sizeof(tSirPNOScanReq));
-
- /*Must translate the mode first*/
- ucDot11Mode = (tANI_U8) csrTranslateToWNICfgDot11Mode(pMac,
+ if (pRequestBuf->enable == 1)
+ {
+ if (pRequestBuf->ucNetworksCount == 0)
+ {
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
+ FL("Network count is 0"));
+ csrReleaseCommand(pMac, pCommand);
+ return eHAL_STATUS_FAILURE;
+ }
+ /*Must translate the mode first*/
+ ucDot11Mode = (tANI_U8) csrTranslateToWNICfgDot11Mode(pMac,
csrFindBestPhyMode( pMac, pMac->roam.configParam.phyMode ));
- /*Prepare a probe request for 2.4GHz band and one for 5GHz band*/
- if (eSIR_SUCCESS == pmcPrepareProbeReqTemplate(pMac, SIR_PNO_24G_DEFAULT_CH,
- ucDot11Mode, pSession->selfMacAddr,
- pRequestBuf->p24GProbeTemplate,
- &pRequestBuf->us24GProbeTemplateLen))
- {
- /* Append IE passed by supplicant(if any) to probe request */
- if ((0 < pRequest->us24GProbeTemplateLen) &&
- ((pRequestBuf->us24GProbeTemplateLen +
- pRequest->us24GProbeTemplateLen) < SIR_PNO_MAX_PB_REQ_SIZE ))
+ /*Prepare a probe request for 2.4GHz band and one for 5GHz band*/
+ if (eSIR_SUCCESS == pmcPrepareProbeReqTemplate(pMac, SIR_PNO_24G_DEFAULT_CH,
+ ucDot11Mode, pSession->selfMacAddr,
+ pRequestBuf->p24GProbeTemplate,
+ &pRequestBuf->us24GProbeTemplateLen))
{
- vos_mem_copy((tANI_U8 *)&pRequestBuf->p24GProbeTemplate +
- pRequestBuf->us24GProbeTemplateLen,
- (tANI_U8 *)&pRequest->p24GProbeTemplate,
- pRequest->us24GProbeTemplateLen);
- pRequestBuf->us24GProbeTemplateLen +=
- pRequest->us24GProbeTemplateLen;
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
- "%s: pRequest->us24GProbeTemplateLen = %d", __func__,
- pRequest->us24GProbeTemplateLen);
- }
- else
- {
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
+ /* Append IE passed by supplicant(if any) to probe request */
+ if ((0 < pRequest->us24GProbeTemplateLen) &&
+ ((pRequestBuf->us24GProbeTemplateLen +
+ pRequest->us24GProbeTemplateLen) < SIR_PNO_MAX_PB_REQ_SIZE ))
+ {
+ vos_mem_copy((tANI_U8 *)&pRequestBuf->p24GProbeTemplate +
+ pRequestBuf->us24GProbeTemplateLen,
+ pRequest->p24GProbeTemplate,
+ pRequest->us24GProbeTemplateLen);
+ pRequestBuf->us24GProbeTemplateLen +=
+ pRequest->us24GProbeTemplateLen;
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
+ "%s: pRequest->us24GProbeTemplateLen = %d", __func__,
+ pRequest->us24GProbeTemplateLen);
+ }
+ else
+ {
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
"%s: Extra ie discarded on 2.4G, IE length = %d Max IE length is %d",
__func__, pRequest->us24GProbeTemplateLen, SIR_PNO_MAX_PB_REQ_SIZE);
+ }
}
- }
- if (eSIR_SUCCESS == pmcPrepareProbeReqTemplate(pMac, SIR_PNO_5G_DEFAULT_CH,
- ucDot11Mode, pSession->selfMacAddr,
- pRequestBuf->p5GProbeTemplate,
- &pRequestBuf->us5GProbeTemplateLen))
- {
- /* Append IE passed by supplicant(if any) to probe request */
- if ((0 < pRequest->us5GProbeTemplateLen ) &&
- ((pRequestBuf->us5GProbeTemplateLen +
- pRequest->us5GProbeTemplateLen) < SIR_PNO_MAX_PB_REQ_SIZE ))
+ if (eSIR_SUCCESS == pmcPrepareProbeReqTemplate(pMac, SIR_PNO_5G_DEFAULT_CH,
+ ucDot11Mode, pSession->selfMacAddr,
+ pRequestBuf->p5GProbeTemplate,
+ &pRequestBuf->us5GProbeTemplateLen))
{
- vos_mem_copy((tANI_U8 *)&pRequestBuf->p5GProbeTemplate +
+ /* Append IE passed by supplicant(if any) to probe request */
+ if ((0 < pRequest->us5GProbeTemplateLen ) &&
+ ((pRequestBuf->us5GProbeTemplateLen +
+ pRequest->us5GProbeTemplateLen) < SIR_PNO_MAX_PB_REQ_SIZE ))
+ {
+ vos_mem_copy((tANI_U8 *)&pRequestBuf->p5GProbeTemplate +
pRequestBuf->us5GProbeTemplateLen,
- (tANI_U8 *)&pRequest->p5GProbeTemplate,
+ pRequest->p5GProbeTemplate,
pRequest->us5GProbeTemplateLen);
- pRequestBuf->us5GProbeTemplateLen += pRequest->us5GProbeTemplateLen;
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
+ pRequestBuf->us5GProbeTemplateLen += pRequest->us5GProbeTemplateLen;
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
"%s: pRequestBuf->us5GProbeTemplateLen = %d", __func__,
pRequest->us5GProbeTemplateLen);
- }
- else
- {
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
- "%s: Extra IE discarded on 5G, IE length = %d Max IE length is %d",
- __func__, pRequest->us5GProbeTemplateLen, SIR_PNO_MAX_PB_REQ_SIZE);
+ }
+ else
+ {
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
+ "%s: Extra IE discarded on 5G, IE length = %d Max IE length is %d",
+ __func__, pRequest->us5GProbeTemplateLen, SIR_PNO_MAX_PB_REQ_SIZE);
+ }
}
}
-
pCommand->command = eSmeCommandPnoReq;
pCommand->sessionId = (tANI_U8)sessionId;
@@ -3057,6 +3037,7 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
FL("failed to post eSmeCommandPnoReq command"));
+ csrReleaseCommand(pMac, pCommand);
return eHAL_STATUS_FAILURE;
}
diff --git a/CORE/WDA/src/wlan_qct_wda.c b/CORE/WDA/src/wlan_qct_wda.c
index 1a5988d..2ae99bd 100644
--- a/CORE/WDA/src/wlan_qct_wda.c
+++ b/CORE/WDA/src/wlan_qct_wda.c
@@ -14883,6 +14883,15 @@
VOS_STATUS_SUCCESS : VOS_STATUS_E_FAILURE);
}
+ if (pPNOScanReqParams->enable == 1)
+ {
+ if (pPNOScanReqParams->aNetworks)
+ vos_mem_free(pPNOScanReqParams->aNetworks);
+ if (pPNOScanReqParams->p24GProbeTemplate)
+ vos_mem_free(pPNOScanReqParams->p24GProbeTemplate);
+ if (pPNOScanReqParams->p5GProbeTemplate)
+ vos_mem_free(pPNOScanReqParams->p5GProbeTemplate);
+ }
vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
vos_mem_free(pWdaParams->wdaMsgParam);
vos_mem_free(pWdaParams);
@@ -15059,9 +15068,18 @@
pPNOScanReqParams->statusCallback(pPNOScanReqParams->callbackContext,
VOS_STATUS_E_FAILURE);
}
-
+ if (pPNOScanReqParams->enable == 1)
+ {
+ if (pPNOScanReqParams->aNetworks)
+ vos_mem_free(pPNOScanReqParams->aNetworks);
+ if (pPNOScanReqParams->p24GProbeTemplate)
+ vos_mem_free(pPNOScanReqParams->p24GProbeTemplate);
+ if (pPNOScanReqParams->p5GProbeTemplate)
+ vos_mem_free(pPNOScanReqParams->p5GProbeTemplate);
+ }
vos_mem_free(pWdaParams->wdaWdiApiMsgParam) ;
vos_mem_free(pWdaParams->wdaMsgParam);
+
pWdaParams->wdaWdiApiMsgParam = NULL;
pWdaParams->wdaMsgParam = NULL;
}