qcacld-3.0: Remove transactionId from deauth_ind
The transactionId in struct deauth_ind is unused, so remove it.
Change-Id: Icb138510b6e3e2cdbc9929d6c317237c7558c4b2
CRs-Fixed: 2403171
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 1c58bb9..cc92870 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
@@ -1081,8 +1081,7 @@
lim_send_sme_deauth_ntf(mac, pMlmDeauthCnf->peer_macaddr.bytes,
resultCode,
pMlmDeauthCnf->deauthTrigger,
- aid, pe_session->smeSessionId,
- pe_session->transactionId);
+ aid, pe_session->smeSessionId);
} /*** end lim_process_mlm_deauth_cnf() ***/
/**
@@ -1157,8 +1156,7 @@
resultCode,
pMlmPurgeStaInd->purgeTrigger,
pMlmPurgeStaInd->aid,
- pe_session->smeSessionId,
- pe_session->transactionId);
+ pe_session->smeSessionId);
} else
lim_send_sme_disassoc_ntf(mac,
pMlmPurgeStaInd->peerMacAddr,
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 e473995..3036a7a 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
@@ -2562,7 +2562,7 @@
send_deauth:
lim_send_sme_deauth_ntf(mac_ctx, sme_deauth_req.peer_macaddr.bytes,
ret_code, deauth_trigger, 1,
- sme_session_id, sme_transaction_id);
+ sme_session_id);
}
/**
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 47ddf88..b9154b6 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
@@ -895,7 +895,6 @@
pSirSmeDeauthInd->length = sizeof(*pSirSmeDeauthInd);
pSirSmeDeauthInd->sessionId = pe_session->smeSessionId;
- pSirSmeDeauthInd->transactionId = pe_session->transactionId;
if (eSIR_INFRA_AP_MODE == pe_session->bssType) {
pSirSmeDeauthInd->statusCode =
(tSirResultCodes) sta->mlmStaContext.cleanupTrigger;
@@ -1061,38 +1060,9 @@
return QDF_STATUS_SUCCESS;
}
-/**
- * lim_send_sme_deauth_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_DEAUTH_CNF or
- * eWNI_SME_DEAUTH_IND to host depending on deauthentication trigger.
- *
- * @param peerMacAddr Indicates the peer MAC addr to which
- * deauthentication was initiated
- * @param reasonCode Indicates the reason for Deauthetication
- * @param deauthTrigger Indicates the trigger for Deauthetication
- * @param aid Indicates the STAID. This parameter is present
- * only on AP.
- *
- * @return None
- */
-void
-lim_send_sme_deauth_ntf(struct mac_context *mac, tSirMacAddr peerMacAddr,
- tSirResultCodes reasonCode, uint16_t deauthTrigger,
- uint16_t aid, uint8_t smesessionId,
- uint16_t smetransactionId)
+void lim_send_sme_deauth_ntf(struct mac_context *mac, tSirMacAddr peerMacAddr,
+ tSirResultCodes reasonCode, uint16_t deauthTrigger,
+ uint16_t aid, uint8_t smesessionId)
{
uint8_t *pBuf;
struct deauth_rsp *pSirSmeDeauthRsp;
@@ -1157,7 +1127,6 @@
pSirSmeDeauthInd->length = sizeof(*pSirSmeDeauthInd);
pSirSmeDeauthInd->reasonCode = eSIR_MAC_UNSPEC_FAILURE_REASON;
pSirSmeDeauthInd->sessionId = smesessionId;
- pSirSmeDeauthInd->transactionId = smetransactionId;
pSirSmeDeauthInd->statusCode = reasonCode;
qdf_mem_copy(pSirSmeDeauthInd->bssid.bytes, pe_session->bssId,
sizeof(tSirMacAddr));
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 ce74d02..176715e 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
@@ -99,8 +99,24 @@
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);
+/**
+ * lim_send_sme_deauth_ntf() - send deauth notice to upper layer
+ * @peerMacAddr: peer MAC addr to which deauthentication was initiated
+ * @reasonCode: the reason for Deauthetication
+ * @deauthTrigger: the trigger for Deauthetication
+ * @aid: the STAID. This parameter is present only on AP.
+ * @smesessionId: ID of the SME session associated with the notification
+ *
+ * This function is used for sending eWNI_SME_DEAUTH_RSP or
+ * eWNI_SME_DEAUTH_IND to upper layers depending on deauthentication
+ * trigger.
+ *
+ * Return: None
+ */
+void lim_send_sme_deauth_ntf(struct mac_context *mac, tSirMacAddr peerMacAddr,
+ tSirResultCodes reasonCode, uint16_t deauthTrigger,
+ uint16_t aid, uint8_t smesessionId);
+
void lim_send_sme_disassoc_ind(struct mac_context *, tpDphHashNode, struct pe_session *);
void lim_send_sme_deauth_ind(struct mac_context *, tpDphHashNode,
struct pe_session *pe_session);