qcacld-3.0: Remove transactionId from set_context_rsp

The transactionId in struct set_context_rsp is unused, so remove it.

Change-Id: I4de2bda5b1ac9644f3b99f5d67a5582c14784128
CRs-Fixed: 2403172
这个提交包含在:
Jeff Johnson
2019-02-21 06:24:57 -08:00
提交者 nshrivas
父节点 953f99aea4
当前提交 c80ed54c69
修改 5 个文件,包含 37 行新增47 行删除

查看文件

@@ -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;
};

查看文件

@@ -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) {

查看文件

@@ -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);

查看文件

@@ -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;

查看文件

@@ -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);