From 64c2b55bce1088becfc0dc2797011078b30cf818 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sat, 9 Jun 2018 22:51:38 -0700 Subject: [PATCH] qcacld-3.0: Correctly call sme_get_current_roam_state() Function sme_get_current_roam_state() takes a mac_handle_t (aka tHalHandle) as the first parameter. However in some cases the caller is actually passing a tpAniSirGlobal. Even though these ultimately reference the same structure, an upcoming change will enforce type safety so update the bad callers to pass a parameter of the correct type. Change-Id: I3e17de9656fd83598cfd35b63843dd3f7b25d072 CRs-Fixed: 2267441 --- core/sme/src/csr/csr_api_roam.c | 2 +- core/sme/src/csr/csr_cmd_process.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 98d333048c92..786f8aaf722a 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -12269,7 +12269,7 @@ csr_roam_chk_lnk_wm_status_change_ntf(tpAniSirGlobal mac_ctx, if (!QDF_IS_STATUS_SUCCESS(status)) break; if (eCSR_ROAMING_STATE_JOINED == - sme_get_current_roam_state(mac_ctx, sessionId) + sme_get_current_roam_state(MAC_HANDLE(mac_ctx), sessionId) && ((eCSR_ROAM_SUBSTATE_JOINED_REALTIME_TRAFFIC == mac_ctx->roam.curSubState[sessionId]) || (eCSR_ROAM_SUBSTATE_NONE == diff --git a/core/sme/src/csr/csr_cmd_process.c b/core/sme/src/csr/csr_cmd_process.c index 2d0285ba3f95..57ad2ad4c93f 100644 --- a/core/sme/src/csr/csr_cmd_process.c +++ b/core/sme/src/csr/csr_cmd_process.c @@ -42,7 +42,7 @@ QDF_STATUS csr_msg_processor(tpAniSirGlobal mac_ctx, void *msg_buf) uint8_t session_id = sme_rsp->sessionId; enum csr_roam_state cur_state; - cur_state = sme_get_current_roam_state(mac_ctx, session_id); + cur_state = sme_get_current_roam_state(MAC_HANDLE(mac_ctx), session_id); sme_debug("msg %d[0x%04X] recvd in curstate %s & substate %s id(%d)", sme_rsp->messageType, sme_rsp->messageType, mac_trace_getcsr_roam_state(cur_state),