lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Remove QDF assert for non critical errors

Browse Source 
Remove the QDF asserts for qos related errors

Change-Id: I61b99f291b305c5905d544f0062a12734a5ea368
CRs-Fixed: 2054327
This commit is contained in:
Kiran Kumar Lokere 2017-06-01 15:45:23 -07:00 committed by snandini
parent cb771c4a16
commit 7855ee8342
1 changed files with 28 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
core/sme/src/qos/sme_qos.c
View File

@ -1233,7 +1233,6 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac,
__func__, __LINE__, sessionId,
ac,
pACInfo->tspec_mask_status);
QDF_ASSERT(0);
qdf_mem_free(pentry);
return SME_QOS_STATUS_SETUP_FAILURE_RSP;
}
@ -1343,9 +1342,10 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac,
"state = %d", __func__,
__LINE__, ac,
pACInfo->curr_state);
QDF_ASSERT(0);
/* unable to service the request */
/* nothing is pending so vote powersave back on */
/* unable to service the request
* nothing is pending so vote powersave
* back on
*/
pSession->readyForPowerSave = true;
return status;
}
@ -1503,7 +1503,6 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac,
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
"%s: %d: no flows running for ac = %d while in state = %d",
__func__, __LINE__, ac, pACInfo->curr_state);
QDF_ASSERT(0);
/* unable to service the request */
/* nothing is pending so vote powersave back on */
pSession->readyForPowerSave = true;
@ -1638,7 +1637,6 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac,
/* unable to service the request */
/* nothing is pending so vote powersave back on */
pSession->readyForPowerSave = true;
QDF_ASSERT(0);
new_state = pACInfo->curr_state;
}
/* if current state is same as previous no need for transistion,
@ -2591,7 +2589,6 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac,
QDF_TRACE_LEVEL_DEBUG,
"%s: %d: Exceeded the array bounds of pACInfo->num_flows",
__func__, __LINE__);
QDF_ASSERT(0);
return
SME_QOS_STATUS_RELEASE_INVALID_PARAMS_RSP;
}
@ -2655,7 +2652,6 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac,
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
"%s: %d: release request in unexpected state = %d",
__func__, __LINE__, pACInfo->curr_state);
QDF_ASSERT(0);
/* unable to service the request */
/* nothing is pending so vote powersave back on */
pSession->readyForPowerSave = true;
@ -3219,8 +3215,11 @@ QDF_STATUS sme_qos_create_tspec_ricie(tpAniSirGlobal pMac,
tDot11fIERICDataDesc ricIE;
uint32_t nStatus;
if (pRICBuffer == NULL || pRICIdentifier == NULL || pRICLength == NULL) {
QDF_ASSERT(0);
if (pRICBuffer == NULL || pRICIdentifier == NULL || pRICLength ==
NULL) {
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
FL("RIC data is NULL, %p, %p, %p"),
pRICBuffer, pRICIdentifier, pRICLength);
return QDF_STATUS_E_FAILURE;
}
@ -3385,7 +3384,6 @@ static QDF_STATUS sme_qos_process_ft_reassoc_req_ev(
FL("FT Reassoc req event in"
" unexpected state %d"),
ac_info->curr_state);
QDF_ASSERT(0);
}
}
}
@ -3717,7 +3715,6 @@ static QDF_STATUS sme_qos_find_matching_tspec(tpAniSirGlobal mac_ctx,
"TSPEC Index %d, RIC Req Identifier = %d"),
ac, tspec_flow_index,
ac_info->ricIdentifier[tspec_flow_index]);
QDF_ASSERT(0);
continue;
}
/* Now we got response for this identifier. Process it. */
@ -3733,7 +3730,6 @@ static QDF_STATUS sme_qos_find_matching_tspec(tpAniSirGlobal mac_ctx,
"Request ID = %d, Response ID = %d"),
ac_info->ricIdentifier[tspec_flow_index],
ric_data_desc->RICData.Identifier);
QDF_ASSERT(0);
} else {
QDF_TRACE(QDF_MODULE_ID_SME,
QDF_TRACE_LEVEL_DEBUG,
@ -3885,7 +3881,6 @@ QDF_STATUS sme_qos_process_ft_reassoc_rsp_ev(tpAniSirGlobal mac_ctx,
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
FL("RIC Resp still follows . Rem len = %d"),
ric_rsplen);
QDF_ASSERT(0);
}
#ifdef WLAN_FEATURE_ROAM_OFFLOAD
} else {
@ -4309,7 +4304,6 @@ QDF_STATUS sme_qos_process_del_ts_ind(tpAniSirGlobal pMac, void *pMsgBuf)
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
"%s: %d: no match found for ac = %d", __func__,
__LINE__, search_key.key.ac_type);
QDF_ASSERT(0);
return QDF_STATUS_E_FAILURE;
}
sme_set_tspec_uapsd_mask_per_session(pMac, tsinfo, sessionId);
@ -4386,7 +4380,6 @@ QDF_STATUS sme_qos_process_assoc_complete_ev(tpAniSirGlobal pMac, uint8_t sessio
pSession->ac_info[SME_QOS_EDCA_AC_BK].curr_state,
pSession->ac_info[SME_QOS_EDCA_AC_VI].curr_state,
pSession->ac_info[SME_QOS_EDCA_AC_VO].curr_state);
QDF_ASSERT(0);
return status;
}
/* the session is active */
@ -4451,6 +4444,9 @@ QDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId
(pSession->ac_info[1].curr_state != SME_QOS_HANDOFF) ||
(pSession->ac_info[2].curr_state != SME_QOS_HANDOFF) ||
(pSession->ac_info[3].curr_state != SME_QOS_HANDOFF)) {
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
FL("curr_state is not HANDOFF, session %d"),
sessionId);
return QDF_STATUS_E_FAILURE;
}
sme_qos_process_ft_reassoc_req_ev(sessionId);
@ -4466,7 +4462,9 @@ QDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId
(pSession->ac_info[1].curr_state != SME_QOS_HANDOFF) ||
(pSession->ac_info[2].curr_state != SME_QOS_HANDOFF) ||
(pSession->ac_info[3].curr_state != SME_QOS_HANDOFF)) {
QDF_ASSERT(0);
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
FL("curr_state is not HANDOFF, session %d"),
sessionId);
return QDF_STATUS_E_FAILURE;
}
/* buffer the existing flows to be renewed after handoff is done */
@ -4485,7 +4483,9 @@ QDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId
(pSession->ac_info[1].curr_state != SME_QOS_HANDOFF) ||
(pSession->ac_info[2].curr_state != SME_QOS_HANDOFF) ||
(pSession->ac_info[3].curr_state != SME_QOS_HANDOFF)) {
QDF_ASSERT(0);
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
FL("curr_state is not HANDOFF, session %d"),
sessionId);
return QDF_STATUS_E_FAILURE;
}
@ -4603,7 +4603,6 @@ QDF_STATUS sme_qos_handle_handoff_state(tpAniSirGlobal mac_ctx,
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
FL("no match found for ac = %d"),
search_key.key.ac_type);
QDF_ASSERT(0);
return QDF_STATUS_E_FAILURE;
}
ac_info->hoRenewal = false;
@ -5028,7 +5027,9 @@ QDF_STATUS sme_qos_process_disconnect_ev(tpAniSirGlobal pMac, uint8_t sessionId,
(pSession->ac_info[1].curr_state != SME_QOS_HANDOFF) ||
(pSession->ac_info[2].curr_state != SME_QOS_HANDOFF) ||
(pSession->ac_info[3].curr_state != SME_QOS_HANDOFF)) {
QDF_ASSERT(0);
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
FL("curr_state is not HANDOFF, session %d"),
sessionId);
return QDF_STATUS_SUCCESS;
}
@ -5083,11 +5084,13 @@ QDF_STATUS sme_qos_process_join_req_ev(tpAniSirGlobal pMac, uint8_t sessionId,
if ((pSession->ac_info[0].curr_state != SME_QOS_HANDOFF) ||
(pSession->ac_info[1].curr_state != SME_QOS_HANDOFF) ||
(pSession->ac_info[2].curr_state != SME_QOS_HANDOFF) ||
(pSession->ac_info[3].curr_state != SME_QOS_HANDOFF)) {
/* just print */
QDF_ASSERT(0);
}
/* buffer the existing flows to be renewed after handoff is done */
(pSession->ac_info[3].curr_state != SME_QOS_HANDOFF))
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
FL("curr_state is not HANDOFF, session %d"),
sessionId);
/* buffer the existing flows to be renewed after handoff is
* done
*/
sme_qos_buffer_existing_flows(pMac, sessionId);
/* clean up the control block partially for handoff */
sme_qos_cleanup_ctrl_blk_for_handoff(pMac, sessionId);
@ -5277,7 +5280,6 @@ QDF_STATUS sme_qos_process_add_ts_failure_rsp(tpAniSirGlobal pMac,
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
"%s: %d: On session %d an AddTS is not pending on AC %d",
__func__, __LINE__, sessionId, ac);
QDF_ASSERT(0);
return QDF_STATUS_E_FAILURE;
}
@ -5293,7 +5295,6 @@ QDF_STATUS sme_qos_process_add_ts_failure_rsp(tpAniSirGlobal pMac,
"%s: %d: On session %d no match found for ac = %d",
__func__, __LINE__, sessionId,
search_key.key.ac_type);
QDF_ASSERT(0);
return QDF_STATUS_E_FAILURE;
}
qdf_mem_zero(&pACInfo->requested_QoSInfo[tspec_pending - 1],
@ -5344,7 +5345,6 @@ static QDF_STATUS sme_qos_update_tspec_mask(uint8_t sessionid,
} else {
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
FL("Exceeded the array bounds"));
QDF_ASSERT(0);
return QDF_STATUS_E_FAILURE;
}
@ -5468,7 +5468,6 @@ QDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac,
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
"%s: %d: Exceeded the array bounds of pACInfo->requested_QosInfo",
__func__, __LINE__);
QDF_ASSERT(0);
return QDF_STATUS_E_FAILURE;
}
}
@ -5570,7 +5569,6 @@ QDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac,
"%s: %d: On session %d no match found for ac %d",
__func__, __LINE__, sessionId,
search_key.key.ac_type);
QDF_ASSERT(0);
return QDF_STATUS_E_FAILURE;
}
pACInfo->hoRenewal = false;
@ -6188,8 +6186,6 @@ bool sme_qos_is_acm(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc,
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
"%s: %d: unknown AC = %d",
__func__, __LINE__, ac);
/* Assert */
QDF_ASSERT(0);
break;
}
} /* IS_QOS_BSS */
@ -6512,7 +6508,6 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id)
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
FL("On session %d unknown cmd = %d"),
session_id, qos_cmd->command);
QDF_ASSERT(0);
break;
}
/* buffered command has been processed, reclaim the memory */
@ -6637,7 +6632,6 @@ QDF_STATUS sme_qos_setup_fnp(tpAniSirGlobal pMac, tListElem *pEntry)
if (!pEntry) {
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
"%s: %d: Entry is NULL", __func__, __LINE__);
QDF_ASSERT(0);
return QDF_STATUS_E_FAILURE;
}
flow_info = GET_BASE_ADDR(pEntry, sme_QosFlowInfoEntry, link);
@ -6678,7 +6672,6 @@ QDF_STATUS sme_qos_modification_notify_fnp(tpAniSirGlobal pMac, tListElem *pEntr
if (!pEntry) {
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
"%s: %d: Entry is NULL", __func__, __LINE__);
QDF_ASSERT(0);
return QDF_STATUS_E_FAILURE;
}
flow_info = GET_BASE_ADDR(pEntry, sme_QosFlowInfoEntry, link);
@ -6715,7 +6708,6 @@ QDF_STATUS sme_qos_modify_fnp(tpAniSirGlobal pMac, tListElem *pEntry)
if (!pEntry) {
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
"%s: %d: Entry is NULL", __func__, __LINE__);
QDF_ASSERT(0);
return QDF_STATUS_E_FAILURE;
}
flow_info = GET_BASE_ADDR(pEntry, sme_QosFlowInfoEntry, link);
@ -6766,7 +6758,6 @@ QDF_STATUS sme_qos_del_ts_ind_fnp(tpAniSirGlobal pMac, tListElem *pEntry)
if (!pEntry) {
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
"%s: %d: Entry is NULL", __func__, __LINE__);
QDF_ASSERT(0);
return QDF_STATUS_E_FAILURE;
}
/* delete the entry from Flow List */
@ -6820,7 +6811,6 @@ sme_qos_reassoc_success_ev_fnp(tpAniSirGlobal mac_ctx,
if (!entry) {
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
"%s: %d: Entry is NULL", __func__, __LINE__);
QDF_ASSERT(0);
return QDF_STATUS_E_FAILURE;
}
flow_info = GET_BASE_ADDR(entry, sme_QosFlowInfoEntry, link);
@ -6951,7 +6941,6 @@ QDF_STATUS sme_qos_add_ts_failure_fnp(tpAniSirGlobal pMac, tListElem *pEntry)
if (!pEntry) {
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
"%s: %d: Entry is NULL", __func__, __LINE__);
QDF_ASSERT(0);
return QDF_STATUS_E_FAILURE;
}
flow_info = GET_BASE_ADDR(pEntry, sme_QosFlowInfoEntry, link);
@ -7048,7 +7037,6 @@ QDF_STATUS sme_qos_add_ts_success_fnp(tpAniSirGlobal mac_ctx,
if (!entry) {
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
FL("Entry is NULL"));
QDF_ASSERT(0);
return QDF_STATUS_E_FAILURE;
}
flow_info = GET_BASE_ADDR(entry, sme_QosFlowInfoEntry, link);