qcacld-3.0: Remove transactionId from disassoc_ind
The transactionId in struct disassoc_ind is unused, so remove it.
Change-Id: I8ab5254f3ec00eff19e32b897f1c8e4c9e4143af
CRs-Fixed: 2403168
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 bf69405..1c58bb9 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
@@ -958,13 +958,13 @@
disassoc_cnf->peerMacAddr, result_code,
disassoc_cnf->disassocTrigger,
disassoc_cnf->aid, session_entry->smeSessionId,
- session_entry->transactionId, session_entry);
+ session_entry);
}
} else if (LIM_IS_AP_ROLE(session_entry)) {
lim_send_sme_disassoc_ntf(mac_ctx, disassoc_cnf->peerMacAddr,
result_code, disassoc_cnf->disassocTrigger,
disassoc_cnf->aid, session_entry->smeSessionId,
- session_entry->transactionId, session_entry);
+ session_entry);
}
}
@@ -1166,7 +1166,6 @@
pMlmPurgeStaInd->purgeTrigger,
pMlmPurgeStaInd->aid,
pe_session->smeSessionId,
- pe_session->transactionId,
pe_session);
} /* end switch (GET_LIM_SYSTEM_ROLE(pe_session)) */
} /*** end lim_process_mlm_purge_sta_ind() ***/
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 c08f9d3..e473995 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
@@ -2202,13 +2202,13 @@
smeDisassocReq.peer_macaddr.bytes,
retCode,
disassocTrigger,
- 1, smesessionId, smetransactionId,
+ 1, smesessionId,
pe_session);
else
lim_send_sme_disassoc_ntf(mac,
smeDisassocReq.peer_macaddr.bytes,
retCode, disassocTrigger, 1,
- smesessionId, smetransactionId, NULL);
+ smesessionId, NULL);
} /*** end __lim_process_sme_disassoc_req() ***/
@@ -3064,7 +3064,6 @@
eSIR_SME_STA_NOT_ASSOCIATED,
eLIM_PEER_ENTITY_DISASSOC, assoc_cnf.aid,
session_entry->smeSessionId,
- session_entry->transactionId,
session_entry);
goto end;
}
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 fc61dff..f8702b7 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
@@ -668,43 +668,13 @@
lim_sys_process_mmh_msg_api(mac, &mmhMsg);
}
-/**
- * lim_send_sme_disassoc_ntf()
- *
- ***FUNCTION:
- * This function is called by limProcessSmeMessages() to send
- * eWNI_SME_DISASSOC_RSP/IND message to host
- *
- ***PARAMS:
- *
- ***LOGIC:
- *
- ***ASSUMPTIONS:
- * NA
- *
- ***NOTE:
- * This function is used for sending eWNI_SME_DISASSOC_CNF,
- * or eWNI_SME_DISASSOC_IND to host depending on
- * disassociation trigger.
- *
- * @param peerMacAddr Indicates the peer MAC addr to which
- * disassociate was initiated
- * @param reasonCode Indicates the reason for Disassociation
- * @param disassocTrigger Indicates the trigger for Disassociation
- * @param aid Indicates the STAID. This parameter is
- * present only on AP.
- *
- * @return None
- */
-void
-lim_send_sme_disassoc_ntf(struct mac_context *mac,
- tSirMacAddr peerMacAddr,
- tSirResultCodes reasonCode,
- uint16_t disassocTrigger,
- uint16_t aid,
- uint8_t smesessionId,
- uint16_t smetransactionId,
- struct pe_session *pe_session)
+void lim_send_sme_disassoc_ntf(struct mac_context *mac,
+ tSirMacAddr peerMacAddr,
+ tSirResultCodes reasonCode,
+ uint16_t disassocTrigger,
+ uint16_t aid,
+ uint8_t smesessionId,
+ struct pe_session *pe_session)
{
struct disassoc_rsp *pSirSmeDisassocRsp;
struct disassoc_ind *pSirSmeDisassocInd;
@@ -819,7 +789,6 @@
pSirSmeDisassocInd->messageType = eWNI_SME_DISASSOC_IND;
pSirSmeDisassocInd->length = sizeof(*pSirSmeDisassocInd);
pSirSmeDisassocInd->sessionId = smesessionId;
- pSirSmeDisassocInd->transactionId = smetransactionId;
pSirSmeDisassocInd->reasonCode = reasonCode;
pSirSmeDisassocInd->statusCode = reasonCode;
qdf_mem_copy(pSirSmeDisassocInd->bssid.bytes,
@@ -873,7 +842,6 @@
pSirSmeDisassocInd->length = sizeof(*pSirSmeDisassocInd);
pSirSmeDisassocInd->sessionId = pe_session->smeSessionId;
- pSirSmeDisassocInd->transactionId = pe_session->transactionId;
pSirSmeDisassocInd->statusCode = eSIR_SME_DEAUTH_STATUS;
pSirSmeDisassocInd->reasonCode = sta->mlmStaContext.disassocReason;
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 e7ce591..ce74d02 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
@@ -74,8 +74,31 @@
uint8_t session_id,
tSirResultCodes reason_code,
uint8_t *peer_mac_addr);
-void lim_send_sme_disassoc_ntf(struct mac_context *, tSirMacAddr, tSirResultCodes,
- uint16_t, uint16_t, uint8_t, uint16_t, struct pe_session *);
+
+/**
+ * lim_send_sme_disassoc_ntf() - Send disassoc notification to upper layer
+ * @mac: Global MAC context
+ * @peerMacAddr: The peer MAC addr to which disassociate was initiated
+ * @reasonCode: The reason for Disassociation
+ * @disassocTrigger: The trigger for Disassociation
+ * @aid: The STAID. This parameter is present only on AP
+ * @smesessionId: ID of the SME session associated with the event
+ * @pe_session: The PE session associated with the event
+ *
+ * This function is used for sending eWNI_SME_DISASSOC_RSP,
+ * or eWNI_SME_DISASSOC_IND to upper layer depending on
+ * disassociation trigger.
+ *
+ * Return: None
+ */
+void lim_send_sme_disassoc_ntf(struct mac_context *mac,
+ tSirMacAddr peerMacAddr,
+ tSirResultCodes reasonCode,
+ uint16_t disassocTrigger,
+ uint16_t aid,
+ uint8_t smesessionId,
+ struct pe_session *pe_session);
+
void lim_send_sme_deauth_ntf(struct mac_context *, tSirMacAddr, tSirResultCodes, uint16_t,
uint16_t, uint8_t, uint16_t);
void lim_send_sme_disassoc_ind(struct mac_context *, tpDphHashNode, struct pe_session *);