From a2da8bfe39eac21d2f38c87a6215e8504aa02455 Mon Sep 17 00:00:00 2001 From: Mahesh Kumar Kalikot Veetil Date: Thu, 14 Jun 2018 12:05:58 -0700 Subject: [PATCH] Revert "qcacld-3.0: Fix empty beacon report issue in 802.11k" This reverts the change I48227166d722496afd2d9dd7aca1ae78d44c8833 because it is refering to the API csr_is_duplicate_bss_description() which is deprecated and not defined. Change-Id: I0f133eed437754f20547a1450090df09a6e0f2ba --- core/sme/src/rrm/sme_rrm.c | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/core/sme/src/rrm/sme_rrm.c b/core/sme/src/rrm/sme_rrm.c index 7b38b30c6f08..be5ee7a972e5 100644 --- a/core/sme/src/rrm/sme_rrm.c +++ b/core/sme/src/rrm/sme_rrm.c @@ -417,7 +417,6 @@ static QDF_STATUS sme_rrm_send_scan_result(tpAniSirGlobal mac_ctx, tpRrmSMEContext rrm_ctx = &mac_ctx->rrm.rrmSmeContext; uint32_t session_id; struct csr_roam_info *roam_info; - tSirScanType scan_type; qdf_mem_zero(&filter, sizeof(filter)); qdf_mem_zero(scanresults_arr, @@ -514,41 +513,11 @@ static QDF_STATUS sme_rrm_send_scan_result(tpAniSirGlobal mac_ctx, goto rrm_send_scan_results_done; } - if (eRRM_MSG_SOURCE_ESE_UPLOAD == rrm_ctx->msgSource || - eRRM_MSG_SOURCE_LEGACY_ESE == rrm_ctx->msgSource) - scan_type = rrm_ctx->measMode[rrm_ctx->currentIndex]; - else - scan_type = rrm_ctx->measMode[0]; - while (scan_results) { - /* - * In passive scan, sta listens beacon. Connected AP beacon - * is offloaded to firmware. Firmware will discard - * connected AP beacon except that special IE exists. - * Connected AP beacon will not be sent to host. Hence, timer - * of connected AP in scan results is not updated and can - * not meet "pScanResult->timer >= RRM_scan_timer". - */ - struct csr_roam_session *session; - uint8_t is_conn_bss_found = false; - - if (scan_type == eSIR_PASSIVE_SCAN) { - session = CSR_GET_SESSION(mac_ctx, session_id); - if (csr_is_conn_state_connected_infra( - mac_ctx, session_id) && - (NULL != session->pConnectBssDesc) && - (csr_is_duplicate_bss_description(mac_ctx, - &scan_results->BssDescriptor, - session->pConnectBssDesc, NULL, false))) { - is_conn_bss_found = true; - sme_debug("Connected BSS in scan results"); - } - } next_result = sme_scan_result_get_next(mac_ctx, result_handle); sme_debug("Scan res timer:%lu, rrm scan timer:%llu", scan_results->timer, rrm_scan_timer); - if ((scan_results->timer >= rrm_scan_timer) || - (is_conn_bss_found == true)) { + if (scan_results->timer >= rrm_scan_timer) { roam_info->pBssDesc = &scan_results->BssDescriptor; csr_roam_call_callback(mac_ctx, session_id, roam_info, 0, eCSR_ROAM_UPDATE_SCAN_RESULT,