qcacld-3.0: Remove transactionId from join_rsp
The transactionId in struct join_rsp is unused, so remove it.
Change-Id: I3a208281994af7454415f71e66cc8abbf8c8561c
CRs-Fixed: 2403166
diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c
index 88cb996..2174559 100644
--- a/core/mac/src/pe/lim/lim_assoc_utils.c
+++ b/core/mac/src/pe/lim/lim_assoc_utils.c
@@ -739,11 +739,8 @@
/* PE setup the peer entry in HW upfront, right after join is completed. */
/* If there is a failure during rest of the assoc sequence, this context needs to be cleaned up. */
uint8_t smesessionId;
- uint16_t smetransactionId;
smesessionId = pe_session->smeSessionId;
- smetransactionId = pe_session->transactionId;
-
pe_session->limSmeState = eLIM_SME_JOIN_FAILURE_STATE;
MTRACE(mac_trace
(mac, TRACE_CODE_SME_STATE, pe_session->peSessionId,
@@ -765,8 +762,7 @@
lim_send_sme_join_reassoc_rsp(mac, eWNI_SME_REASSOC_RSP,
mlmStaContext.resultCode,
mlmStaContext.protStatusCode,
- pe_session, smesessionId,
- smetransactionId);
+ pe_session, smesessionId);
if (mlmStaContext.resultCode != eSIR_SME_SUCCESS) {
pe_delete_session(mac, pe_session);
pe_session = NULL;
@@ -785,8 +781,7 @@
lim_send_sme_join_reassoc_rsp(mac, eWNI_SME_JOIN_RSP,
mlmStaContext.resultCode,
mlmStaContext.protStatusCode,
- pe_session, smesessionId,
- smetransactionId);
+ pe_session, smesessionId);
if (mlmStaContext.resultCode != eSIR_SME_SUCCESS) {
pe_delete_session(mac, pe_session);
diff --git a/core/mac/src/pe/lim/lim_process_mlm_host_roam.c b/core/mac/src/pe/lim/lim_process_mlm_host_roam.c
index 4f5ae1d..a7859c3 100644
--- a/core/mac/src/pe/lim/lim_process_mlm_host_roam.c
+++ b/core/mac/src/pe/lim/lim_process_mlm_host_roam.c
@@ -178,14 +178,12 @@
{
tpDphHashNode sta = NULL;
uint8_t smesessionId;
- uint16_t smetransactionId;
if (pe_session == NULL) {
pe_err("pe_session is NULL");
return;
}
smesessionId = pe_session->smeSessionId;
- smetransactionId = pe_session->transactionId;
if (resultCode != eSIR_SME_SUCCESS) {
sta =
dph_get_hash_entry(mac, DPH_STA_HASH_INDEX_PEER,
@@ -217,7 +215,7 @@
}
}
lim_send_sme_join_reassoc_rsp(mac, eWNI_SME_REASSOC_RSP, resultCode,
- protStatusCode, pe_session, smesessionId, smetransactionId);
+ protStatusCode, pe_session, smesessionId);
}
/**
@@ -298,8 +296,7 @@
lim_send_sme_join_reassoc_rsp(mac_ctx, eWNI_SME_REASSOC_RSP,
lim_mlm_reassoc_cnf->resultCode,
lim_mlm_reassoc_cnf->protStatusCode,
- session, session->smeSessionId,
- session->transactionId);
+ session, session->smeSessionId);
} else if (lim_mlm_reassoc_cnf->resultCode
== eSIR_SME_REASSOC_REFUSED) {
/*
@@ -314,8 +311,7 @@
lim_send_sme_join_reassoc_rsp(mac_ctx, eWNI_SME_REASSOC_RSP,
lim_mlm_reassoc_cnf->resultCode,
lim_mlm_reassoc_cnf->protStatusCode,
- session, session->smeSessionId,
- session->transactionId);
+ session, session->smeSessionId);
} else {
/* Reassociation failure */
session->limSmeState = eLIM_SME_JOIN_FAILURE_STATE;
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 545bc0a..afa09cb 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
@@ -1248,7 +1248,6 @@
join_params *link_state_params = (join_params *) param;
struct pe_session *session;
uint8_t sme_session_id;
- uint16_t sme_trans_id;
if (!link_state_params) {
pe_err("Link state params is NULL");
@@ -1261,11 +1260,10 @@
return;
}
sme_session_id = session->smeSessionId;
- sme_trans_id = session->transactionId;
lim_send_sme_join_reassoc_rsp(mac, eWNI_SME_JOIN_RSP,
link_state_params->result_code,
link_state_params->prot_status_code,
- session, sme_session_id, sme_trans_id);
+ session, sme_session_id);
pe_delete_session(mac, session);
qdf_mem_free(link_state_params);
}
@@ -1355,8 +1353,7 @@
lim_send_sme_join_reassoc_rsp(mac_ctx, eWNI_SME_JOIN_RSP,
param->result_code,
param->prot_status_code,
- session, session->smeSessionId,
- session->transactionId);
+ session, session->smeSessionId);
return QDF_STATUS_SUCCESS;
}
@@ -1389,8 +1386,7 @@
return lim_send_sme_join_reassoc_rsp(mac_ctx, eWNI_SME_JOIN_RSP,
result_code,
prot_status_code, session,
- session->smeSessionId,
- session->transactionId);
+ session->smeSessionId);
param.result_code = result_code;
param.prot_status_code = prot_status_code;
@@ -1409,7 +1405,6 @@
{
tpDphHashNode sta_ds = NULL;
uint8_t sme_session_id;
- uint16_t sme_trans_id;
join_params *param = NULL;
if (session_entry == NULL) {
@@ -1417,7 +1412,6 @@
return;
}
sme_session_id = session_entry->smeSessionId;
- sme_trans_id = session_entry->transactionId;
/*
* When associations is failed , delete the session created
* and pass NULL to limsendsmeJoinReassocRsp()
@@ -1480,7 +1474,7 @@
}
lim_send_sme_join_reassoc_rsp(mac_ctx, eWNI_SME_JOIN_RSP, result_code,
- prot_status_code, session_entry, sme_session_id, sme_trans_id);
+ prot_status_code, session_entry, sme_session_id);
}
#endif
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 d361925..2c0e6e4 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
@@ -1672,8 +1672,7 @@
pe_debug("Send failure status on sessionid: %d with ret_code: %d",
sme_session_id, ret_code);
lim_send_sme_join_reassoc_rsp(mac_ctx, eWNI_SME_JOIN_RSP, ret_code,
- eSIR_MAC_UNSPEC_FAILURE_STATUS, session, sme_session_id,
- sme_transaction_id);
+ eSIR_MAC_UNSPEC_FAILURE_STATUS, session, sme_session_id);
}
uint8_t lim_get_max_tx_power(int8_t regMax, int8_t apTxPower,
@@ -1972,23 +1971,21 @@
session_entry->pLimReAssocReq = NULL;
}
- if (session_entry) {
+ if (session_entry)
/*
- * error occurred after we determined the session so extract
- * session and transaction info from there, otherwise we'll
- * use the values already extracted from the message
+ * error occurred after we determined the session so
+ * extract session id from there, otherwise we'll use
+ * the value already extracted from the message
*/
sme_session_id = session_entry->smeSessionId;
- transaction_id = session_entry->transactionId;
- }
+
/*
* Send Reassoc failure response to host
* (note session_entry may be NULL, but that's OK)
*/
lim_send_sme_join_reassoc_rsp(mac_ctx, eWNI_SME_REASSOC_RSP,
ret_code, eSIR_MAC_UNSPEC_FAILURE_STATUS,
- session_entry, sme_session_id,
- transaction_id);
+ session_entry, sme_session_id);
}
bool send_disassoc_frame = 1;
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 b3aab14..8b0fc99 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
@@ -403,29 +403,13 @@
struct pe_session *session_entry)
{}
#endif
-/**
- * lim_send_sme_join_reassoc_rsp() - Send Response to Upper Layers
- * @mac_ctx: Pointer to Global MAC structure
- * @msg_type: Indicates message type
- * @result_code: Indicates the result of previously issued
- * eWNI_SME_msgType_REQ message
- * @prot_status_code: Protocol Status Code
- * @session_entry: PE Session Info
- * @sme_session_id: SME Session ID
- * @sme_transaction_id: SME Transaction ID
- *
- * This function is called by lim_process_sme_req_messages() to send
- * eWNI_SME_JOIN_RSP or eWNI_SME_REASSOC_RSP messages to applications
- * above MAC Software.
- *
- * Return: None
- */
-void
-lim_send_sme_join_reassoc_rsp(struct mac_context *mac_ctx, uint16_t msg_type,
- tSirResultCodes result_code, uint16_t prot_status_code,
- struct pe_session *session_entry, uint8_t sme_session_id,
- uint16_t sme_transaction_id)
+void lim_send_sme_join_reassoc_rsp(struct mac_context *mac_ctx,
+ uint16_t msg_type,
+ tSirResultCodes result_code,
+ uint16_t prot_status_code,
+ struct pe_session *session_entry,
+ uint8_t sme_session_id)
{
struct join_rsp *sme_join_rsp;
uint32_t rsp_len;
@@ -520,7 +504,6 @@
sme_join_rsp->protStatusCode = prot_status_code;
sme_join_rsp->sessionId = sme_session_id;
- sme_join_rsp->transactionId = sme_transaction_id;
lim_send_sme_join_reassoc_rsp_after_resume(mac_ctx, QDF_STATUS_SUCCESS,
sme_join_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 f0491bb..d82f5b5 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
@@ -55,10 +55,29 @@
struct pe_session *pe_session,
uint8_t smesessionId);
-void lim_send_sme_join_reassoc_rsp(struct mac_context *, uint16_t, tSirResultCodes,
- uint16_t, struct pe_session *, uint8_t, uint16_t);
+/**
+ * lim_send_sme_join_reassoc_rsp() - Send Response to Upper Layers
+ * @mac_ctx: Pointer to Global MAC structure
+ * @msg_type: Indicates message type
+ * @result_code: Indicates the result of previously issued request
+ * @prot_status_code: Protocol Status Code
+ * @session_entry: PE Session Info
+ * @sme_session_id: SME Session ID
+ *
+ * This function is called by lim_process_sme_req_messages() to send
+ * eWNI_SME_JOIN_RSP or eWNI_SME_REASSOC_RSP messages to applications
+ * above MAC Software.
+ *
+ * Return: None
+ */
+void lim_send_sme_join_reassoc_rsp(struct mac_context *mac_ctx,
+ uint16_t msg_type,
+ tSirResultCodes result_code,
+ uint16_t prot_status_code,
+ struct pe_session *session_entry,
+ uint8_t sme_session_id);
-/*
+/**
* lim_prepare_disconnect_done_ind() - Prepares the disconnect done ind message
* @mac_ctx: Global mac_ctx
* @session_id: PE session id