From 55ba104911aea926820420748cf28a4f0d3ed43c Mon Sep 17 00:00:00 2001 From: Will Huang Date: Wed, 22 Mar 2017 10:43:30 +0800 Subject: [PATCH] qcacld-3.0: Avoid dead loop in sap_process_avoid_ie qcacld-2.0 to qcacld-3.0 propagation In function sap_process_avoid_ie, if type of avoid_ch_ie is not QCOM_VENDOR_IE_MCC_AVOID_CH, we need to get next node(scan result) for process. Otherwise the dead loop causes VosMcThread stuck. Change-Id: If0e736c5b8a5638ea2bc96c3afb25be286959942 CRs-Fixed: 2019048 --- core/sap/src/sap_ch_select.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/sap/src/sap_ch_select.c b/core/sap/src/sap_ch_select.c index 37b8e270ae64..e02618ff2aeb 100644 --- a/core/sap/src/sap_ch_select.c +++ b/core/sap/src/sap_ch_select.c @@ -314,8 +314,12 @@ static void sap_process_avoid_ie(tHalHandle hal, if (temp_ptr) { avoid_ch_ie = (struct sAvoidChannelIE *)temp_ptr; - if (avoid_ch_ie->type != QCOM_VENDOR_IE_MCC_AVOID_CH) + if (avoid_ch_ie->type != + QCOM_VENDOR_IE_MCC_AVOID_CH) { + node = sme_scan_result_get_next(hal, + scan_result); continue; + } sap_ctx->sap_detected_avoid_ch_ie.present = 1; QDF_TRACE(QDF_MODULE_ID_SAP,