samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Remove transactionId from tSirDeltsRsp

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

Change-Id: I83135573cdf53d61a8fcd4e2cd803eebca060e6d
CRs-Fixed: 2403174
This commit is contained in:
Jeff Johnson
2019-02-21 09:46:03 -08:00
committed by nshrivas
parent 4836302298
commit b2b63e0772
4 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/mac/inc/sir_api.h
View File

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

6
core/mac/src/pe/lim/lim_process_sme_req_messages.c
View File

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

14
core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
View File

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

2
core/mac/src/pe/lim/lim_send_sme_rsp_messages.h
View File

@@ -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, void lim_send_sme_delts_rsp(struct mac_context *mac, tpSirDeltsReq delts,
uint32_t status, struct pe_session *pe_session, 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, void lim_send_sme_delts_ind(struct mac_context *mac,
struct delts_req_info *delts, struct delts_req_info *delts,
uint16_t aid, struct pe_session *); uint16_t aid, struct pe_session *);