Browse Source

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
Jeff Johnson 6 years ago
parent
commit
64c2b55bce
2 changed files with 2 additions and 2 deletions
  1. 1 1
      core/sme/src/csr/csr_api_roam.c
  2. 1 1
      core/sme/src/csr/csr_cmd_process.c

+ 1 - 1
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 ==

+ 1 - 1
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),