qcacld-3.0: Replace lim_log() with pe_* log levels in rrm_api.c
Replace lim_log() with pe_* appropriate log levels in rrm_api.c Change-Id: I7d40c0c11a542c4a751808a77c65b121efef8032 CRs-Fixed: 1093093
This commit is contained in:
Srinivas Girigowda
committed by
Sandeep Puligilla
Sandeep Puligilla
szülő
dfd2120d20
commit
19b944f854
@@ -67,9 +67,8 @@ rrm_get_min_of_max_tx_power(tpAniSirGlobal pMac,
|
||||
else
|
||||
maxTxPower = RRM_MAX_TX_PWR_CAP;
|
||||
|
||||
lim_log(pMac, LOG3,
|
||||
"%s: regulatoryMax = %d, apTxPwr = %d, maxTxpwr = %d",
|
||||
__func__, regMax, apTxPower, maxTxPower);
|
||||
pe_debug("regulatoryMax: %d, apTxPwr: %d, maxTxpwr: %d",
|
||||
regMax, apTxPower, maxTxPower);
|
||||
return maxTxPower;
|
||||
}
|
||||
|
||||
@@ -92,12 +91,11 @@ void
|
||||
rrm_cache_mgmt_tx_power(tpAniSirGlobal pMac, int8_t txPower,
|
||||
tpPESession pSessionEntry)
|
||||
{
|
||||
lim_log(pMac, LOGD, "Cache Mgmt Tx Power: %d", txPower);
|
||||
pe_debug("Cache Mgmt Tx Power: %d", txPower);
|
||||
|
||||
if (pSessionEntry == NULL) {
|
||||
lim_log(pMac, LOG3, "%s: pSessionEntry is NULL", __func__);
|
||||
if (pSessionEntry == NULL)
|
||||
pMac->rrm.rrmPEContext.txMgmtPower = txPower;
|
||||
} else
|
||||
else
|
||||
pSessionEntry->txMgmtPower = txPower;
|
||||
}
|
||||
|
||||
@@ -118,13 +116,10 @@ rrm_cache_mgmt_tx_power(tpAniSirGlobal pMac, int8_t txPower,
|
||||
*/
|
||||
int8_t rrm_get_mgmt_tx_power(tpAniSirGlobal pMac, tpPESession pSessionEntry)
|
||||
{
|
||||
if (pSessionEntry == NULL) {
|
||||
lim_log(pMac, LOG3, "%s: txpower from rrmPEContext: %d",
|
||||
__func__, pMac->rrm.rrmPEContext.txMgmtPower);
|
||||
if (pSessionEntry == NULL)
|
||||
return pMac->rrm.rrmPEContext.txMgmtPower;
|
||||
}
|
||||
|
||||
lim_log(pMac, LOGD, FL("tx mgmt pwr %d"), pSessionEntry->txMgmtPower);
|
||||
pe_debug("tx mgmt pwr %d", pSessionEntry->txMgmtPower);
|
||||
|
||||
return pSessionEntry->txMgmtPower;
|
||||
}
|
||||
@@ -154,13 +149,12 @@ rrm_send_set_max_tx_power_req(tpAniSirGlobal pMac, int8_t txPower,
|
||||
struct scheduler_msg msgQ = {0};
|
||||
|
||||
if (pSessionEntry == NULL) {
|
||||
PELOGE(lim_log(pMac, LOGE, FL("Invalid parameters"));)
|
||||
pe_err("Invalid parameters");
|
||||
return eSIR_FAILURE;
|
||||
}
|
||||
pMaxTxParams = qdf_mem_malloc(sizeof(tMaxTxPowerParams));
|
||||
if (NULL == pMaxTxParams) {
|
||||
lim_log(pMac, LOGP,
|
||||
FL("Unable to allocate memory for pMaxTxParams "));
|
||||
pe_err("Unable to allocate memory for pMaxTxParams");
|
||||
return eSIR_MEM_ALLOC_FAILED;
|
||||
|
||||
}
|
||||
@@ -177,16 +171,13 @@ rrm_send_set_max_tx_power_req(tpAniSirGlobal pMac, int8_t txPower,
|
||||
msgQ.bodyptr = pMaxTxParams;
|
||||
msgQ.bodyval = 0;
|
||||
|
||||
lim_log(pMac, LOG3,
|
||||
FL("Sending WMA_SET_MAX_TX_POWER_REQ with power(%d) to HAL"),
|
||||
pe_debug("Sending WMA_SET_MAX_TX_POWER_REQ with power(%d) to HAL",
|
||||
txPower);
|
||||
|
||||
MTRACE(mac_trace_msg_tx(pMac, pSessionEntry->peSessionId, msgQ.type));
|
||||
retCode = wma_post_ctrl_msg(pMac, &msgQ);
|
||||
if (eSIR_SUCCESS != retCode) {
|
||||
lim_log(pMac, LOGP,
|
||||
FL
|
||||
("Posting WMA_SET_MAX_TX_POWER_REQ to HAL failed, reason=%X"),
|
||||
pe_err("Posting WMA_SET_MAX_TX_POWER_REQ to HAL failed, reason=%X",
|
||||
retCode);
|
||||
qdf_mem_free(pMaxTxParams);
|
||||
return retCode;
|
||||
@@ -231,9 +222,6 @@ tSirRetStatus rrm_set_max_tx_power_rsp(tpAniSirGlobal pMac,
|
||||
pMaxTxParams->bssId.bytes,
|
||||
&sessionId);
|
||||
if (pSessionEntry == NULL) {
|
||||
PELOGE(lim_log
|
||||
(pMac, LOGE, FL("Unable to find session:"));
|
||||
)
|
||||
retCode = eSIR_FAILURE;
|
||||
} else {
|
||||
rrm_cache_mgmt_tx_power(pMac, pMaxTxParams->power,
|
||||
@@ -273,13 +261,10 @@ rrm_process_link_measurement_request(tpAniSirGlobal pMac,
|
||||
tpSirMacMgmtHdr pHdr;
|
||||
int8_t currentRSSI = 0;
|
||||
|
||||
lim_log(pMac, LOG3, "Received Link measurement request");
|
||||
pe_debug("Received Link measurement request");
|
||||
|
||||
if (pRxPacketInfo == NULL || pLinkReq == NULL || pSessionEntry == NULL) {
|
||||
PELOGE(lim_log(pMac, LOGE,
|
||||
"%s Invalid parameters - Ignoring the request",
|
||||
__func__);
|
||||
)
|
||||
pe_err("Invalid parameters - Ignoring the request");
|
||||
return eSIR_FAILURE;
|
||||
}
|
||||
pHdr = WMA_GET_RX_MAC_HEADER(pRxPacketInfo);
|
||||
@@ -293,15 +278,12 @@ rrm_process_link_measurement_request(tpAniSirGlobal pMac,
|
||||
(eSIR_SUCCESS == rrm_send_set_max_tx_power_req(pMac,
|
||||
LinkReport.txPower,
|
||||
pSessionEntry))) {
|
||||
PELOGW(lim_log
|
||||
(pMac, LOGW,
|
||||
FL(" maxTx power in link report is not same as local..."
|
||||
" Local = %d Link Request TxPower = %d"
|
||||
" Link Report TxPower = %d"),
|
||||
pSessionEntry->maxTxPower, LinkReport.txPower,
|
||||
pLinkReq->MaxTxPower.maxTxPower);
|
||||
)
|
||||
pSessionEntry->maxTxPower =
|
||||
pe_warn("maxTx power in link report is not same as local..."
|
||||
" Local: %d Link Request TxPower: %d"
|
||||
" Link Report TxPower: %d",
|
||||
pSessionEntry->maxTxPower, LinkReport.txPower,
|
||||
pLinkReq->MaxTxPower.maxTxPower);
|
||||
pSessionEntry->maxTxPower =
|
||||
LinkReport.txPower;
|
||||
}
|
||||
|
||||
@@ -310,7 +292,7 @@ rrm_process_link_measurement_request(tpAniSirGlobal pMac,
|
||||
LinkReport.txAntenna = 0;
|
||||
currentRSSI = WMA_GET_RX_RSSI_RAW(pRxPacketInfo);
|
||||
|
||||
lim_log(pMac, LOG1, "Received Link report frame with %d", currentRSSI);
|
||||
pe_info("Received Link report frame with %d", currentRSSI);
|
||||
|
||||
/* 2008 11k spec reference: 18.4.8.5 RCPI Measurement */
|
||||
if ((currentRSSI) <= RCPI_LOW_RSSI_VALUE)
|
||||
@@ -322,7 +304,7 @@ rrm_process_link_measurement_request(tpAniSirGlobal pMac,
|
||||
|
||||
LinkReport.rsni = WMA_GET_RX_SNR(pRxPacketInfo);
|
||||
|
||||
lim_log(pMac, LOG3, "Sending Link report frame");
|
||||
pe_debug("Sending Link report frame");
|
||||
|
||||
return lim_send_link_report_action_frame(pMac, &LinkReport, pHdr->sa,
|
||||
pSessionEntry);
|
||||
@@ -356,26 +338,20 @@ rrm_process_neighbor_report_response(tpAniSirGlobal pMac,
|
||||
struct scheduler_msg mmhMsg = {0};
|
||||
|
||||
if (pNeighborRep == NULL || pSessionEntry == NULL) {
|
||||
PELOGE(lim_log(pMac, LOGE, FL(" Invalid parameters"));)
|
||||
pe_err("Invalid parameters");
|
||||
return status;
|
||||
}
|
||||
|
||||
lim_log(pMac, LOG3, FL("Neighbor report response received "));
|
||||
pe_debug("Neighbor report response received");
|
||||
|
||||
/* Dialog token */
|
||||
if (pMac->rrm.rrmPEContext.DialogToken !=
|
||||
pNeighborRep->DialogToken.token) {
|
||||
PELOGE(lim_log
|
||||
(pMac, LOGE,
|
||||
"Dialog token mismatch in the received Neighbor report");
|
||||
)
|
||||
pe_err("Dialog token mismatch in the received Neighbor report");
|
||||
return eSIR_FAILURE;
|
||||
}
|
||||
if (pNeighborRep->num_NeighborReport == 0) {
|
||||
PELOGE(lim_log
|
||||
(pMac, LOGE,
|
||||
"No neighbor report in the frame...Dropping it");
|
||||
)
|
||||
pe_err("No neighbor report in the frame...Dropping it");
|
||||
return eSIR_FAILURE;
|
||||
}
|
||||
length = (sizeof(tSirNeighborReportInd)) +
|
||||
@@ -385,9 +361,8 @@ rrm_process_neighbor_report_response(tpAniSirGlobal pMac,
|
||||
/* Prepare the request to send to SME. */
|
||||
pSmeNeighborRpt = qdf_mem_malloc(length);
|
||||
if (NULL == pSmeNeighborRpt) {
|
||||
PELOGE(lim_log(pMac, LOGP, FL("Unable to allocate memory"));)
|
||||
pe_err("Unable to allocate memory");
|
||||
return eSIR_MEM_ALLOC_FAILED;
|
||||
|
||||
}
|
||||
|
||||
/* Allocated memory for pSmeNeighborRpt...will be freed by other module */
|
||||
@@ -476,20 +451,17 @@ rrm_process_neighbor_report_req(tpAniSirGlobal pMac,
|
||||
uint8_t sessionId;
|
||||
|
||||
if (pNeighborReq == NULL) {
|
||||
PELOGE(lim_log(pMac, LOGE, "NeighborReq is NULL");)
|
||||
pe_err("NeighborReq is NULL");
|
||||
return eSIR_FAILURE;
|
||||
}
|
||||
pSessionEntry = pe_find_session_by_bssid(pMac, pNeighborReq->bssId,
|
||||
&sessionId);
|
||||
if (pSessionEntry == NULL) {
|
||||
PELOGE(lim_log
|
||||
(pMac, LOGE,
|
||||
FL("session does not exist for given bssId"));
|
||||
)
|
||||
pe_err("session does not exist for given bssId");
|
||||
return eSIR_FAILURE;
|
||||
}
|
||||
|
||||
lim_log(pMac, LOG1, FL("SSID present = %d "), pNeighborReq->noSSID);
|
||||
pe_debug("SSID present: %d", pNeighborReq->noSSID);
|
||||
|
||||
qdf_mem_set(&NeighborReportReq, sizeof(tSirMacNeighborReportReq), 0);
|
||||
|
||||
@@ -551,10 +523,7 @@ rrm_process_beacon_report_req(tpAniSirGlobal pMac,
|
||||
/* Beacon reporting should not be included in request if number of repetitons is zero. */
|
||||
/* IEEE Std 802.11k-2008 Table 7-29g and section 11.10.8.1 */
|
||||
|
||||
PELOGE(lim_log
|
||||
(pMac, LOGE,
|
||||
"Dropping the request: Reporting condition included in beacon report request and it is not zero");
|
||||
)
|
||||
pe_err("Dropping the request: Reporting condition included in beacon report request and it is not zero");
|
||||
return eRRM_INCAPABLE;
|
||||
}
|
||||
|
||||
@@ -580,16 +549,12 @@ rrm_process_beacon_report_req(tpAniSirGlobal pMac,
|
||||
|
||||
measDuration = pBeaconReq->measurement_request.Beacon.meas_duration;
|
||||
|
||||
lim_log(pMac, LOG1,
|
||||
"maxDuration = %d sign = %d maxMeasduration = %d measDuration = %d",
|
||||
pe_info("maxDuration = %d sign = %d maxMeasduration = %d measDuration = %d",
|
||||
maxDuration, sign, maxMeasduration, measDuration);
|
||||
|
||||
if (maxMeasduration < measDuration) {
|
||||
if (pBeaconReq->durationMandatory) {
|
||||
PELOGE(lim_log
|
||||
(pMac, LOGE,
|
||||
"Dropping the request: duration mandatory and maxduration > measduration");
|
||||
)
|
||||
pe_err("Dropping the request: duration mandatory and maxduration > measduration");
|
||||
return eRRM_REFUSED;
|
||||
} else
|
||||
measDuration = maxMeasduration;
|
||||
@@ -606,13 +571,9 @@ rrm_process_beacon_report_req(tpAniSirGlobal pMac,
|
||||
pBeaconReq->measurement_request.Beacon.
|
||||
RequestedInfo.num_requested_eids);
|
||||
if (NULL == pCurrentReq->request.Beacon.reqIes.pElementIds) {
|
||||
lim_log(pMac, LOGP,
|
||||
FL
|
||||
("Unable to allocate memory for request IEs buffer"));
|
||||
pe_err("Unable to allocate memory for request IEs buffer");
|
||||
return eRRM_FAILURE;
|
||||
}
|
||||
lim_log(pMac, LOG3, FL(" Allocated memory for pElementIds"));
|
||||
|
||||
pCurrentReq->request.Beacon.reqIes.num =
|
||||
pBeaconReq->measurement_request.Beacon.RequestedInfo.
|
||||
num_requested_eids;
|
||||
@@ -634,10 +595,7 @@ rrm_process_beacon_report_req(tpAniSirGlobal pMac,
|
||||
/* Prepare the request to send to SME. */
|
||||
pSmeBcnReportReq = qdf_mem_malloc(sizeof(tSirBeaconReportReqInd));
|
||||
if (NULL == pSmeBcnReportReq) {
|
||||
lim_log(pMac, LOGP,
|
||||
FL
|
||||
("Unable to allocate memory during Beacon Report Req Ind to SME"));
|
||||
|
||||
pe_err("Unable to allocate memory during Beacon Report Req Ind to SME");
|
||||
return eRRM_FAILURE;
|
||||
|
||||
}
|
||||
@@ -732,7 +690,7 @@ rrm_fill_beacon_ies(tpAniSirGlobal pMac,
|
||||
uint8_t BcnNumIes;
|
||||
|
||||
if ((pIes == NULL) || (pNumIes == NULL) || (pBssDesc == NULL)) {
|
||||
PELOGE(lim_log(pMac, LOGE, FL(" Invalid parameters"));)
|
||||
pe_err("Invalid parameters");
|
||||
return;
|
||||
}
|
||||
/* Make sure that if eid is null, numEids is set to zero. */
|
||||
@@ -758,14 +716,14 @@ rrm_fill_beacon_ies(tpAniSirGlobal pMac,
|
||||
|
||||
while (BcnNumIes > 0) {
|
||||
len = *(pBcnIes + 1) + 2; /* element id + length. */
|
||||
lim_log(pMac, LOG3, "EID = %d, len = %d total = %d",
|
||||
pe_debug("EID = %d, len = %d total = %d",
|
||||
*pBcnIes, *(pBcnIes + 1), len);
|
||||
|
||||
i = 0;
|
||||
do {
|
||||
if (((eids == NULL) || (*pBcnIes == eids[i])) &&
|
||||
((*pNumIes) + len) < pIesMaxSize) {
|
||||
lim_log(pMac, LOG3, "Adding Eid %d, len=%d",
|
||||
pe_debug("Adding Eid %d, len=%d",
|
||||
*pBcnIes, len);
|
||||
|
||||
qdf_mem_copy(pIes, pBcnIes, len);
|
||||
@@ -780,7 +738,7 @@ rrm_fill_beacon_ies(tpAniSirGlobal pMac,
|
||||
pBcnIes += len;
|
||||
BcnNumIes -= len;
|
||||
}
|
||||
lim_log(pMac, LOG1, "Total length of Ies added = %d", *pNumIes);
|
||||
pe_debug("Total length of Ies added = %d", *pNumIes);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -805,17 +763,15 @@ rrm_process_beacon_report_xmit(tpAniSirGlobal mac_ctx,
|
||||
uint8_t session_id;
|
||||
uint8_t bss_desc_count = 0;
|
||||
|
||||
lim_log(mac_ctx, LOG1, FL("Received beacon report xmit indication"));
|
||||
pe_debug("Received beacon report xmit indication");
|
||||
|
||||
if (NULL == beacon_xmit_ind) {
|
||||
lim_log(mac_ctx, LOGE,
|
||||
FL("Received beacon_xmit_ind is NULL in PE"));
|
||||
pe_err("Received beacon_xmit_ind is NULL in PE");
|
||||
return eSIR_FAILURE;
|
||||
}
|
||||
|
||||
if (NULL == curr_req) {
|
||||
lim_log(mac_ctx, LOGE,
|
||||
FL("Received report xmit while there is no request pending in PE"));
|
||||
pe_err("Received report xmit while there is no request pending in PE");
|
||||
return eSIR_FAILURE;
|
||||
}
|
||||
|
||||
@@ -827,7 +783,7 @@ rrm_process_beacon_report_xmit(tpAniSirGlobal mac_ctx,
|
||||
session_entry = pe_find_session_by_bssid(mac_ctx,
|
||||
beacon_xmit_ind->bssId, &session_id);
|
||||
if (NULL == session_entry) {
|
||||
lim_log(mac_ctx, LOGE, FL("session does not exist for given bssId"));
|
||||
pe_err("session does not exist for given bssId");
|
||||
return eSIR_FAILURE;
|
||||
}
|
||||
|
||||
@@ -835,7 +791,7 @@ rrm_process_beacon_report_xmit(tpAniSirGlobal mac_ctx,
|
||||
sizeof(*report));
|
||||
|
||||
if (NULL == report) {
|
||||
lim_log(mac_ctx, LOGE, FL("RRM Report is NULL, allocation failed"));
|
||||
pe_err("RRM Report is NULL, allocation failed");
|
||||
return eSIR_MEM_ALLOC_FAILED;
|
||||
}
|
||||
|
||||
@@ -883,13 +839,11 @@ rrm_process_beacon_report_xmit(tpAniSirGlobal mac_ctx,
|
||||
switch (curr_req->request.Beacon.reportingDetail) {
|
||||
case BEACON_REPORTING_DETAIL_NO_FF_IE:
|
||||
/* 0: No need to include any elements. */
|
||||
lim_log(mac_ctx, LOG3,
|
||||
FL("No reporting detail requested"));
|
||||
pe_debug("No reporting detail requested");
|
||||
break;
|
||||
case BEACON_REPORTING_DETAIL_ALL_FF_REQ_IE:
|
||||
/* 1: Include all FFs and Requested Ies. */
|
||||
lim_log(mac_ctx, LOG3,
|
||||
FL("Only requested IEs in reporting detail requested"));
|
||||
pe_debug("Only requested IEs in reporting detail requested");
|
||||
|
||||
if (bss_desc) {
|
||||
rrm_fill_beacon_ies(mac_ctx,
|
||||
@@ -905,7 +859,7 @@ rrm_process_beacon_report_xmit(tpAniSirGlobal mac_ctx,
|
||||
case BEACON_REPORTING_DETAIL_ALL_FF_IE:
|
||||
/* 2: default - Include all FFs and all Ies. */
|
||||
default:
|
||||
lim_log(mac_ctx, LOG3, FL("Default all IEs and FFs"));
|
||||
pe_debug("Default all IEs and FFs");
|
||||
if (bss_desc) {
|
||||
rrm_fill_beacon_ies(mac_ctx,
|
||||
(uint8_t *) &beacon_report->Ies[0],
|
||||
@@ -919,7 +873,7 @@ rrm_process_beacon_report_xmit(tpAniSirGlobal mac_ctx,
|
||||
}
|
||||
}
|
||||
|
||||
lim_log(mac_ctx, LOG1, FL("Sending Action frame with %d bss info"),
|
||||
pe_info("Sending Action frame with %d bss info",
|
||||
bss_desc_count);
|
||||
lim_send_radio_measure_report_action_frame(mac_ctx,
|
||||
curr_req->dialog_token, bss_desc_count, report,
|
||||
@@ -929,7 +883,7 @@ rrm_process_beacon_report_xmit(tpAniSirGlobal mac_ctx,
|
||||
}
|
||||
|
||||
if (beacon_xmit_ind->fMeasureDone) {
|
||||
lim_log(mac_ctx, LOG3, FL("Measurement done....cleanup the context"));
|
||||
pe_debug("Measurement done....cleanup the context");
|
||||
rrm_cleanup(mac_ctx);
|
||||
}
|
||||
|
||||
@@ -949,16 +903,13 @@ static void rrm_process_beacon_request_failure(tpAniSirGlobal pMac,
|
||||
|
||||
pReport = qdf_mem_malloc(sizeof(tSirMacRadioMeasureReport));
|
||||
if (NULL == pReport) {
|
||||
lim_log(pMac, LOGP,
|
||||
FL
|
||||
("Unable to allocate memory during RRM Req processing"));
|
||||
pe_err("Unable to allocate memory during RRM Req processing");
|
||||
return;
|
||||
}
|
||||
pReport->token = pCurrentReq->token;
|
||||
pReport->type = SIR_MAC_RRM_BEACON_TYPE;
|
||||
|
||||
lim_log(pMac, LOG1,
|
||||
FL("status %d token %d"), status, pReport->token);
|
||||
pe_debug("status %d token %d", status, pReport->token);
|
||||
|
||||
switch (status) {
|
||||
case eRRM_REFUSED:
|
||||
@@ -968,11 +919,8 @@ static void rrm_process_beacon_request_failure(tpAniSirGlobal pMac,
|
||||
pReport->incapable = 1;
|
||||
break;
|
||||
default:
|
||||
PELOGE(lim_log(pMac, LOGE,
|
||||
FL
|
||||
(" Beacon request processing failed no report sent with status %d "),
|
||||
pe_err("Beacon request processing failed no report sent with status %d",
|
||||
status);
|
||||
);
|
||||
qdf_mem_free(pReport);
|
||||
return;
|
||||
}
|
||||
@@ -981,7 +929,6 @@ static void rrm_process_beacon_request_failure(tpAniSirGlobal pMac,
|
||||
pReport, peer, pSessionEntry);
|
||||
|
||||
qdf_mem_free(pReport);
|
||||
lim_log(pMac, LOG3, FL(" Free memory for pReport"));
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1019,12 +966,10 @@ tSirRetStatus rrm_process_beacon_req(tpAniSirGlobal mac_ctx, tSirMacAddr peer,
|
||||
report = qdf_mem_malloc(sizeof(*report) *
|
||||
(rrm_req->num_MeasurementRequest - index));
|
||||
if (NULL == report) {
|
||||
lim_log(mac_ctx, LOGP,
|
||||
FL("Unable to allocate memory during RRM Req processing"));
|
||||
pe_err("Unable to allocate memory during RRM Req processing");
|
||||
return eSIR_MEM_ALLOC_FAILED;
|
||||
}
|
||||
lim_log(mac_ctx, LOG3,
|
||||
FL("rrm beacon type refused of %d report in beacon table"),
|
||||
pe_debug("rrm beacon type refused of %d report in beacon table",
|
||||
*num_report);
|
||||
}
|
||||
report[*num_report].refused = 1;
|
||||
@@ -1036,12 +981,11 @@ tSirRetStatus rrm_process_beacon_req(tpAniSirGlobal mac_ctx, tSirMacAddr peer,
|
||||
} else {
|
||||
curr_req = qdf_mem_malloc(sizeof(*curr_req));
|
||||
if (NULL == curr_req) {
|
||||
lim_log(mac_ctx, LOGP,
|
||||
FL("Unable to allocate memory during RRM Req processing"));
|
||||
pe_err("Unable to allocate memory during RRM Req processing");
|
||||
qdf_mem_free(report);
|
||||
return eSIR_MEM_ALLOC_FAILED;
|
||||
}
|
||||
lim_log(mac_ctx, LOG3, FL(" Processing Beacon Report request"));
|
||||
pe_debug("Processing Beacon Report request");
|
||||
curr_req->dialog_token = rrm_req->DialogToken.token;
|
||||
curr_req->token = rrm_req->
|
||||
MeasurementRequest[index].measurement_token;
|
||||
@@ -1084,10 +1028,10 @@ tSirRetStatus update_rrm_report(tpAniSirGlobal mac_ctx,
|
||||
report = qdf_mem_malloc(sizeof(*report) *
|
||||
(rrm_req->num_MeasurementRequest - index));
|
||||
if (NULL == report) {
|
||||
lim_log(mac_ctx, LOGP, FL("Unable to allocate memory during RRM Req processing"));
|
||||
pe_err("Unable to allocate memory during RRM Req processing");
|
||||
return eSIR_MEM_ALLOC_FAILED;
|
||||
}
|
||||
lim_log(mac_ctx, LOG3, FL("rrm beacon type incapable of %d report "),
|
||||
pe_debug("rrm beacon type incapable of %d report",
|
||||
*num_report);
|
||||
}
|
||||
report[*num_report].incapable = 1;
|
||||
@@ -1126,10 +1070,10 @@ rrm_process_radio_measurement_request(tpAniSirGlobal mac_ctx,
|
||||
if (!rrm_req->num_MeasurementRequest) {
|
||||
report = qdf_mem_malloc(sizeof(tSirMacRadioMeasureReport));
|
||||
if (NULL == report) {
|
||||
lim_log(mac_ctx, LOGP, FL("Unable to allocate memory during RRM Req processing"));
|
||||
pe_err("Unable to allocate memory during RRM Req processing");
|
||||
return eSIR_MEM_ALLOC_FAILED;
|
||||
}
|
||||
lim_log(mac_ctx, LOGE, FL("No requestIes in the measurement request, sending incapable report"));
|
||||
pe_err("No requestIes in the measurement request, sending incapable report");
|
||||
report->incapable = 1;
|
||||
num_report = 1;
|
||||
lim_send_radio_measure_report_action_frame(mac_ctx,
|
||||
@@ -1140,7 +1084,7 @@ rrm_process_radio_measurement_request(tpAniSirGlobal mac_ctx,
|
||||
}
|
||||
/* PF Fix */
|
||||
if (rrm_req->NumOfRepetitions.repetitions > 0) {
|
||||
lim_log(mac_ctx, LOG1, FL(" number of repetitions %d"),
|
||||
pe_info("number of repetitions %d",
|
||||
rrm_req->NumOfRepetitions.repetitions);
|
||||
/*
|
||||
* Send a report with incapable bit set.
|
||||
@@ -1148,10 +1092,9 @@ rrm_process_radio_measurement_request(tpAniSirGlobal mac_ctx,
|
||||
*/
|
||||
report = qdf_mem_malloc(sizeof(tSirMacRadioMeasureReport));
|
||||
if (NULL == report) {
|
||||
lim_log(mac_ctx, LOGP, FL("Unable to allocate memory during RRM Req processing"));
|
||||
pe_err("Unable to allocate memory during RRM Req processing");
|
||||
return eSIR_MEM_ALLOC_FAILED;
|
||||
}
|
||||
lim_log(mac_ctx, LOGE, FL("Allocated memory for report"));
|
||||
report->incapable = 1;
|
||||
report->type = rrm_req->MeasurementRequest[0].measurement_type;
|
||||
num_report = 1;
|
||||
@@ -1171,8 +1114,7 @@ rrm_process_radio_measurement_request(tpAniSirGlobal mac_ctx,
|
||||
case SIR_MAC_RRM_LCI_TYPE:
|
||||
case SIR_MAC_RRM_LOCATION_CIVIC_TYPE:
|
||||
case SIR_MAC_RRM_FINE_TIME_MEAS_TYPE:
|
||||
lim_log(mac_ctx, LOG1,
|
||||
FL("RRM with type: %d sent to userspace"),
|
||||
pe_debug("RRM with type: %d sent to userspace",
|
||||
rrm_req->MeasurementRequest[i].measurement_type);
|
||||
break;
|
||||
default:
|
||||
@@ -1191,7 +1133,6 @@ end:
|
||||
rrm_req->DialogToken.token, num_report, report,
|
||||
peer, session_entry);
|
||||
qdf_mem_free(report);
|
||||
lim_log(mac_ctx, LOG3, FL(" Free memory for report"));
|
||||
}
|
||||
return status;
|
||||
}
|
||||
@@ -1327,11 +1268,9 @@ tSirRetStatus rrm_cleanup(tpAniSirGlobal pMac)
|
||||
pElementIds) {
|
||||
qdf_mem_free(pMac->rrm.rrmPEContext.pCurrentReq->
|
||||
request.Beacon.reqIes.pElementIds);
|
||||
lim_log(pMac, LOG4, FL(" Free memory for pElementIds"));
|
||||
}
|
||||
|
||||
qdf_mem_free(pMac->rrm.rrmPEContext.pCurrentReq);
|
||||
lim_log(pMac, LOG4, FL(" Free memory for pCurrentReq"));
|
||||
}
|
||||
|
||||
pMac->rrm.rrmPEContext.pCurrentReq = NULL;
|
||||
|
||||
Reference in New Issue
Block a user