From ea09f91ec36d78b0c9842b1b4de2e3e3ec10cb71 Mon Sep 17 00:00:00 2001 From: sheenam monga Date: Wed, 22 Apr 2020 22:27:09 +0530 Subject: [PATCH] qcacld-3.0: Update beacon rpt error code Currently, There is no check for new report to find if previous beacon report request is in progress. So whenever a new beacon report request comes, it is processed without consideration of any ongoing beacon request processing. Fix is to add a check of request in progress and append err code BCN_RPT_ERR_PREVIOUS_REQUEST_PROGRESS in measurement report response. To find that curr report request is in progress, add a check mac_ctx->rrm.rrmPEContext.pCurrentReq[index]. For valid mac_ctx->rrm.rrmPEContext.pCurrentReq[index] err vsie will append. Change-Id: I91127c5c9ccaa19f20c29c85524b89b873e02e17 CRs-Fixed: 2668127 --- core/mac/src/pe/rrm/rrm_api.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/mac/src/pe/rrm/rrm_api.c b/core/mac/src/pe/rrm/rrm_api.c index 8609bdf7355e..c3df42087d81 100644 --- a/core/mac/src/pe/rrm/rrm_api.c +++ b/core/mac/src/pe/rrm/rrm_api.c @@ -1178,7 +1178,8 @@ QDF_STATUS rrm_process_beacon_req(struct mac_context *mac_ctx, tSirMacAddr peer, tpSirMacRadioMeasureReport report; tpRRMReq curr_req; - if (index >= MAX_MEASUREMENT_REQUEST) { + if (index >= MAX_MEASUREMENT_REQUEST || + mac_ctx->rrm.rrmPEContext.pCurrentReq[index]) { if (!*radiomes_report) { /* * Allocate memory to send reports for