diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index ac1c3e3ca5..870d58b6ba 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -1392,7 +1392,6 @@ struct set_context_rsp { uint16_t messageType; /* eWNI_SME_SET_CONTEXT_RSP */ uint16_t length; uint8_t sessionId; /* Session ID */ - uint16_t transactionId; /* Transaction ID for cmd */ tSirResultCodes statusCode; struct qdf_mac_addr peer_macaddr; }; diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c index cc92870357..545bc0a284 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c @@ -1228,8 +1228,7 @@ void lim_process_mlm_set_keys_cnf(struct mac_context *mac, uint32_t *pMsgBuf) pMlmSetKeysCnf->peer_macaddr, 1, (tSirResultCodes) pMlmSetKeysCnf->resultCode, - pe_session, pe_session->smeSessionId, - pe_session->transactionId); + pe_session, pe_session->smeSessionId); } /*** end lim_process_mlm_set_keys_cnf() ***/ /** @@ -2836,7 +2835,7 @@ void lim_process_mlm_set_sta_key_rsp(struct mac_context *mac_ctx, lim_send_sme_set_context_rsp(mac_ctx, mlm_set_key_cnf.peer_macaddr, 0, eSIR_SME_INVALID_SESSION, NULL, - sme_session_id, 0); + sme_session_id); return; } result_status = set_key_params->status; @@ -2930,7 +2929,7 @@ void lim_process_mlm_set_bss_key_rsp(struct mac_context *mac_ctx, msg->bodyptr = NULL; lim_send_sme_set_context_rsp(mac_ctx, set_key_cnf.peer_macaddr, 0, eSIR_SME_INVALID_SESSION, NULL, - sme_session_id, 0); + sme_session_id); return; } if (eLIM_MLM_WT_SET_BSS_KEY_STATE == session_entry->limMlmState) { diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index 3036a7a179..a73e1cfdd6 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -2613,7 +2613,7 @@ __lim_process_sme_set_context_req(struct mac_context *mac_ctx, lim_send_sme_set_context_rsp(mac_ctx, set_context_req->peer_macaddr, 1, eSIR_SME_INVALID_PARAMETERS, NULL, - sme_session_id, sme_transaction_id); + sme_session_id); goto end; } @@ -2624,7 +2624,7 @@ __lim_process_sme_set_context_req(struct mac_context *mac_ctx, lim_send_sme_set_context_rsp(mac_ctx, set_context_req->peer_macaddr, 1, eSIR_SME_INVALID_PARAMETERS, NULL, - sme_session_id, sme_transaction_id); + sme_session_id); goto end; } #ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM /* FEATURE_WLAN_DIAG_SUPPORT */ @@ -2699,8 +2699,7 @@ __lim_process_sme_set_context_req(struct mac_context *mac_ctx, lim_send_sme_set_context_rsp(mac_ctx, set_context_req->peer_macaddr, 1, eSIR_SME_UNEXPECTED_REQ_RESULT_CODE, - session_entry, sme_session_id, - sme_transaction_id); + session_entry, sme_session_id); } end: qdf_mem_free(set_context_req); diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c index b9154b62a9..c1e3537551 100644 --- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c @@ -1222,39 +1222,12 @@ lim_send_sme_wm_status_change_ntf(struct mac_context *mac_ctx, } /*** end lim_send_sme_wm_status_change_ntf() ***/ -/** - * lim_send_sme_set_context_rsp() - * - ***FUNCTION: - * This function is called by limProcessSmeMessages() to send - * eWNI_SME_SETCONTEXT_RSP message to host - * - ***PARAMS: - * - ***LOGIC: - * - ***ASSUMPTIONS: - * NA - * - ***NOTE: - * - * @param mac Pointer to Global MAC structure - * @param peerMacAddr Indicates the peer MAC addr to which - * setContext was performed - * @param aid Indicates the aid corresponding to the peer MAC - * address - * @param resultCode Indicates the result of previously issued - * eWNI_SME_SETCONTEXT_RSP message - * - * @return None - */ -void -lim_send_sme_set_context_rsp(struct mac_context *mac, - struct qdf_mac_addr peer_macaddr, uint16_t aid, - tSirResultCodes resultCode, - struct pe_session *pe_session, - uint8_t smesessionId, - uint16_t smetransactionId) +void lim_send_sme_set_context_rsp(struct mac_context *mac, + struct qdf_mac_addr peer_macaddr, + uint16_t aid, + tSirResultCodes resultCode, + struct pe_session *pe_session, + uint8_t smesessionId) { struct scheduler_msg mmhMsg = {0}; struct set_context_rsp *set_context_rsp; @@ -1269,9 +1242,7 @@ lim_send_sme_set_context_rsp(struct mac_context *mac, qdf_copy_macaddr(&set_context_rsp->peer_macaddr, &peer_macaddr); - /* Update SME session and transaction Id */ set_context_rsp->sessionId = smesessionId; - set_context_rsp->transactionId = smetransactionId; mmhMsg.type = eWNI_SME_SETCONTEXT_RSP; mmhMsg.bodyptr = set_context_rsp; diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.h b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.h index 176715ed0a..75e28812c4 100644 --- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.h +++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.h @@ -122,9 +122,31 @@ void lim_send_sme_deauth_ind(struct mac_context *, tpDphHashNode, struct pe_session *pe_session); void lim_send_sme_wm_status_change_ntf(struct mac_context *, tSirSmeStatusChangeCode, uint32_t *, uint16_t, uint8_t); -void lim_send_sme_set_context_rsp(struct mac_context *, struct qdf_mac_addr, uint16_t, - tSirResultCodes, struct pe_session *, uint8_t, uint16_t); -void lim_handle_delete_bss_rsp(struct mac_context *mac, struct scheduler_msg *MsgQ); + +/** + * lim_send_sme_set_context_rsp() - Send set context response to upper layer + * @mac: Pointer to Global MAC structure + * @peer_macaddr: the peer MAC addr to which setContext was performed + * @aid: the aid corresponding to the peer MAC address + * @resultCode: the result of previously issued Set Context Req message + * @pe_session: The PE session associated with the peer + * @smesessionId: ID of the SME session associated with the peer + * + * This function is called to send eWNI_SME_SETCONTEXT_RSP message to + * upper layer + * + * Return: None + */ +void lim_send_sme_set_context_rsp(struct mac_context *mac, + struct qdf_mac_addr peer_macaddr, + uint16_t aid, + tSirResultCodes resultCode, + struct pe_session *pe_session, + uint8_t smesessionId); + +void lim_handle_delete_bss_rsp(struct mac_context *mac, + struct scheduler_msg *MsgQ); + void lim_handle_csa_offload_msg(struct mac_context *mac_ctx, struct scheduler_msg *msg);