Ver código fonte

qcacld-3.0: Remove transactionId from disassoc_req

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

Change-Id: I63594303967999e6b19e77d7ed614b5316be1874
CRs-Fixed: 2403178
Jeff Johnson 6 anos atrás
pai
commit
b3dfc3b017

+ 0 - 1
core/mac/inc/sir_api.h

@@ -1230,7 +1230,6 @@ struct disassoc_req {
 	uint16_t messageType;   /* eWNI_SME_DISASSOC_REQ */
 	uint16_t length;
 	uint8_t sessionId;      /* Session ID */
-	uint16_t transactionId; /* Transaction ID for cmd */
 	struct qdf_mac_addr bssid;      /* Peer BSSID */
 	struct qdf_mac_addr peer_macaddr;
 	uint16_t reasonCode;

+ 2 - 6
core/mac/src/pe/lim/lim_process_sme_req_messages.c

@@ -1996,7 +1996,8 @@ bool send_disassoc_frame = 1;
  * @return None
  */
 
-static void __lim_process_sme_disassoc_req(struct mac_context *mac, uint32_t *pMsgBuf)
+static void __lim_process_sme_disassoc_req(struct mac_context *mac,
+					   uint32_t *pMsgBuf)
 {
 	uint16_t disassocTrigger, reasonCode;
 	tLimMlmDisassocReq *pMlmDisassocReq;
@@ -2005,7 +2006,6 @@ static void __lim_process_sme_disassoc_req(struct mac_context *mac, uint32_t *pM
 	struct pe_session *pe_session = NULL;
 	uint8_t sessionId;
 	uint8_t smesessionId;
-	uint16_t smetransactionId;
 
 	if (pMsgBuf == NULL) {
 		pe_err("Buffer is Pointing to NULL");
@@ -2014,7 +2014,6 @@ static void __lim_process_sme_disassoc_req(struct mac_context *mac, uint32_t *pM
 
 	qdf_mem_copy(&smeDisassocReq, pMsgBuf, sizeof(struct disassoc_req));
 	smesessionId = smeDisassocReq.sessionId;
-	smetransactionId = smeDisassocReq.transactionId;
 	if (!lim_is_sme_disassoc_req_valid(mac,
 					   &smeDisassocReq,
 					   pe_session)) {
@@ -2052,10 +2051,7 @@ static void __lim_process_sme_disassoc_req(struct mac_context *mac, uint32_t *pM
 			      0, smeDisassocReq.reasonCode);
 #endif /* FEATURE_WLAN_DIAG_SUPPORT */
 
-	/* Update SME session Id and SME transaction ID */
-
 	pe_session->smeSessionId = smesessionId;
-	pe_session->transactionId = smetransactionId;
 	pe_debug("ho_fail: %d ", smeDisassocReq.process_ho_fail);
 	pe_session->process_ho_fail = smeDisassocReq.process_ho_fail;
 

+ 0 - 1
core/sme/src/csr/csr_api_roam.c

@@ -15506,7 +15506,6 @@ QDF_STATUS csr_send_mb_disassoc_req_msg(struct mac_context *mac,
 	pMsg->messageType = eWNI_SME_DISASSOC_REQ;
 	pMsg->length = sizeof(*pMsg);
 	pMsg->sessionId = sessionId;
-	pMsg->transactionId = 0;
 	if ((pSession->pCurRoamProfile != NULL)
 		&& (CSR_IS_INFRA_AP(pSession->pCurRoamProfile))) {
 		qdf_mem_copy(&pMsg->bssid.bytes,