Browse Source

qcacld-3.0: Remove transactionId from tSirDeltsRsp

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

Change-Id: I83135573cdf53d61a8fcd4e2cd803eebca060e6d
CRs-Fixed: 2403174
Jeff Johnson 6 years ago
parent
commit
b2b63e0772

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

@@ -1634,8 +1634,7 @@ typedef struct sSirDeltsReq {
 typedef struct sSirDeltsRsp {
 	uint16_t messageType;   /* eWNI_SME_DELTS_RSP */
 	uint16_t length;
-	uint8_t sessionId;      /* sme sessionId  Added for BT-AMP support */
-	uint16_t transactionId; /* sme transaction Id - for BT-AMP Support */
+	uint8_t sessionId;
 	uint32_t rc;
 	uint16_t aid;           /* use 0 if macAddr is being specified */
 	struct qdf_mac_addr macaddr;    /* only on AP to specify the STA */

+ 3 - 3
core/mac/src/pe/lim/lim_process_sme_req_messages.c

@@ -3330,8 +3330,8 @@ static void __lim_process_sme_delts_req(struct mac_context *mac, uint32_t *pMsgB
 	    lim_validate_delts_req(mac, pDeltsReq, peerMacAddr, pe_session)) {
 		pe_err("lim_validate_delts_req failed");
 		status = QDF_STATUS_E_FAILURE;
-		lim_send_sme_delts_rsp(mac, pDeltsReq, QDF_STATUS_E_FAILURE, pe_session,
-				       smesessionId, smetransactionId);
+		lim_send_sme_delts_rsp(mac, pDeltsReq, QDF_STATUS_E_FAILURE,
+				       pe_session, smesessionId);
 		return;
 	}
 
@@ -3399,7 +3399,7 @@ static void __lim_process_sme_delts_req(struct mac_context *mac, uint32_t *pMsgB
 	/* send an sme response back */
 end:
 	lim_send_sme_delts_rsp(mac, pDeltsReq, QDF_STATUS_SUCCESS, pe_session,
-			       smesessionId, smetransactionId);
+			       smesessionId);
 }
 
 void lim_process_sme_addts_rsp_timeout(struct mac_context *mac, uint32_t param)

+ 3 - 11
core/mac/src/pe/lim/lim_send_sme_rsp_messages.c

@@ -1287,10 +1287,9 @@ void lim_send_sme_addts_rsp(struct mac_context *mac,
 	return;
 }
 
-void
-lim_send_sme_delts_rsp(struct mac_context *mac, tpSirDeltsReq delts, uint32_t status,
-		       struct pe_session *pe_session, uint8_t smesessionId,
-		       uint16_t smetransactionId)
+void lim_send_sme_delts_rsp(struct mac_context *mac, tpSirDeltsReq delts,
+			    uint32_t status, struct pe_session *pe_session,
+			    uint8_t smesessionId)
 {
 	tpSirDeltsRsp rsp;
 	struct scheduler_msg mmhMsg = {0};
@@ -1316,10 +1315,7 @@ lim_send_sme_delts_rsp(struct mac_context *mac, tpSirDeltsReq delts, uint32_t st
 
 	rsp->messageType = eWNI_SME_DELTS_RSP;
 	rsp->rc = status;
-
-	/* Update SME session Id and transcation Id */
 	rsp->sessionId = smesessionId;
-	rsp->transactionId = smetransactionId;
 
 	mmhMsg.type = eWNI_SME_DELTS_RSP;
 	mmhMsg.bodyptr = rsp;
@@ -1357,11 +1353,7 @@ lim_send_sme_delts_ind(struct mac_context *mac, struct delts_req_info *delts,
 	rsp->rc = QDF_STATUS_SUCCESS;
 	rsp->aid = aid;
 	qdf_mem_copy((uint8_t *) &rsp->rsp, (uint8_t *) delts, sizeof(*delts));
-
-	/* Update SME  session Id and SME transaction Id */
-
 	rsp->sessionId = pe_session->smeSessionId;
-	rsp->transactionId = pe_session->transactionId;
 
 	mmhMsg.type = eWNI_SME_DELTS_IND;
 	mmhMsg.bodyptr = rsp;

+ 1 - 1
core/mac/src/pe/lim/lim_send_sme_rsp_messages.h

@@ -194,7 +194,7 @@ void lim_send_sme_addts_rsp(struct mac_context *mac,
 
 void lim_send_sme_delts_rsp(struct mac_context *mac, tpSirDeltsReq delts,
 			    uint32_t status, struct pe_session *pe_session,
-			    uint8_t smesessionId, uint16_t smetransactionId);
+			    uint8_t smesessionId);
 void lim_send_sme_delts_ind(struct mac_context *mac,
 			    struct delts_req_info *delts,
 			    uint16_t aid, struct pe_session *);