lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Remove transactionId from tSirAddtsRsp

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

Change-Id: I89bd793f761c42c661269b71da0cda273cc38769
CRs-Fixed: 2403173
This commit is contained in:
Jeff Johnson 2019-02-21 09:34:02 -08:00 committed by nshrivas
parent c80ed54c69
commit 0781949054
6 changed files with 32 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1615,7 +1615,6 @@ typedef struct sSirAddtsRsp {
uint16_t messageType; /* eWNI_SME_ADDTS_RSP */
uint16_t length;
uint8_t sessionId; /* sme sessionId Added for BT-AMP support */
uint16_t transactionId; /* sme transaction Id - for BT-AMP Support */
uint32_t rc; /* return code */
tSirAddtsRspInfo rsp;
} tSirAddtsRsp, *tpSirAddtsRsp;

9
core/mac/src/pe/lim/lim_admit_control.c
View File

@ -976,8 +976,7 @@ void lim_process_hal_add_ts_rsp(struct mac_context *mac,
pAddTsRspMsg->sessionId);
lim_send_sme_addts_rsp(mac, rspReqd, eSIR_SME_ADDTS_RSP_FAILED,
pe_session, pAddTsRspMsg->tspec,
mac->lim.gLimAddtsReq.sessionId,
mac->lim.gLimAddtsReq.transactionId);
mac->lim.gLimAddtsReq.sessionId);
goto end;
}
@ -986,8 +985,7 @@ void lim_process_hal_add_ts_rsp(struct mac_context *mac,
/* Use the smesessionId and smetransactionId from the PE session context */
lim_send_sme_addts_rsp(mac, rspReqd, eSIR_SME_SUCCESS,
pe_session, pAddTsRspMsg->tspec,
pe_session->smeSessionId,
pe_session->transactionId);
pe_session->smeSessionId);
goto end;
} else {
pe_debug("Received failure ADDTS response from HAL");
@ -1015,8 +1013,7 @@ void lim_process_hal_add_ts_rsp(struct mac_context *mac,
/* 090803: Use the smesessionId and smetransactionId from the PE session context */
lim_send_sme_addts_rsp(mac, rspReqd, eSIR_SME_ADDTS_RSP_FAILED,
pe_session, pAddTsRspMsg->tspec,
pe_session->smeSessionId,
pe_session->transactionId);
pe_session->smeSessionId);
goto end;
}

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

@ -745,8 +745,7 @@ static void __lim_process_add_ts_rsp(struct mac_context *mac_ctx,
addts.tspec.tsinfo.traffic.tsid,
addts.tspec.tsinfo.traffic.userPrio, addts.status);
lim_send_sme_addts_rsp(mac_ctx, true, addts.status, session,
addts.tspec, session->smeSessionId,
session->transactionId);
addts.tspec, session->smeSessionId);
/* clear the addts flag */
mac_ctx->lim.gLimAddtsSent = false;
@ -856,8 +855,7 @@ static void __lim_process_add_ts_rsp(struct mac_context *mac_ctx,
&addts.tspec, session);
lim_send_sme_addts_rsp(mac_ctx, true, retval,
session, addts.tspec,
session->smeSessionId,
session->transactionId);
session->smeSessionId);
mac_ctx->lim.gLimAddtsSent = false;
return;
}
@ -869,13 +867,9 @@ static void __lim_process_add_ts_rsp(struct mac_context *mac_ctx,
addts.tspec.tsinfo.traffic.userPrio,
addts.tspec.tsinfo.traffic.tsid);
pe_debug("no ACM: Bypass sending WMA_ADD_TS_REQ to HAL");
/*
* Use the smesessionId and smetransactionId from the PE
* session context
*/
lim_send_sme_addts_rsp(mac_ctx, true, eSIR_SME_SUCCESS,
session, addts.tspec, session->smeSessionId,
session->transactionId);
session, addts.tspec,
session->smeSessionId);
}
/* clear the addts flag */
mac_ctx->lim.gLimAddtsSent = false;

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

@ -3177,9 +3177,10 @@ static void __lim_process_sme_addts_req(struct mac_context *mac, uint32_t *pMsgB
&sessionId);
if (pe_session == NULL) {
pe_err("Session Does not exist for given bssId");
lim_send_sme_addts_rsp(mac, pSirAddts->rspReqd, QDF_STATUS_E_FAILURE,
lim_send_sme_addts_rsp(mac, pSirAddts->rspReqd,
QDF_STATUS_E_FAILURE,
NULL, pSirAddts->req.tspec,
smesessionId, smetransactionId);
smesessionId);
return;
}
#ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM /* FEATURE_WLAN_DIAG_SUPPORT */
@ -3296,7 +3297,7 @@ static void __lim_process_sme_addts_req(struct mac_context *mac, uint32_t *pMsgB
send_failure_addts_rsp:
lim_send_sme_addts_rsp(mac, pSirAddts->rspReqd, QDF_STATUS_E_FAILURE,
pe_session, pSirAddts->req.tspec,
smesessionId, smetransactionId);
smesessionId);
}
static void __lim_process_sme_delts_req(struct mac_context *mac, uint32_t *pMsgBuf)
@ -3440,8 +3441,7 @@ void lim_process_sme_addts_rsp_timeout(struct mac_context *mac, uint32_t param)
lim_send_sme_addts_rsp(mac, true, eSIR_SME_ADDTS_RSP_TIMEOUT,
pe_session, mac->lim.gLimAddtsReq.req.tspec,
pe_session->smeSessionId,
pe_session->transactionId);
pe_session->smeSessionId);
}
#ifndef QCA_SUPPORT_CP_STATS

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

@ -1263,21 +1263,11 @@ void lim_send_sme_set_context_rsp(struct mac_context *mac,
mac->lim.sme_msg_callback(mac, &mmhMsg);
} /*** end lim_send_sme_set_context_rsp() ***/
/** -----------------------------------------------------------------
\brief lim_send_sme_addts_rsp() - sends SME ADDTS RSP
\ This function sends a eWNI_SME_ADDTS_RSP to SME.
\ SME only looks at rc and tspec field.
\param mac - global mac structure
\param rspReqd - is SmeAddTsRsp required
\param status - status code of SME_ADD_TS_RSP
\return tspec
\sa
----------------------------------------------------------------- */
void
lim_send_sme_addts_rsp(struct mac_context *mac, uint8_t rspReqd,
uint32_t status,
struct pe_session *pe_session, struct mac_tspec_ie tspec,
uint8_t smesessionId, uint16_t smetransactionId)
void lim_send_sme_addts_rsp(struct mac_context *mac,
uint8_t rspReqd, uint32_t status,
struct pe_session *pe_session,
struct mac_tspec_ie tspec,
uint8_t smesessionId)
{
tpSirAddtsRsp rsp;
struct scheduler_msg mmhMsg = {0};
@ -1293,9 +1283,7 @@ lim_send_sme_addts_rsp(struct mac_context *mac, uint8_t rspReqd,
rsp->rc = status;
rsp->rsp.status = (enum eSirMacStatusCodes)status;
rsp->rsp.tspec = tspec;
/* Update SME session Id and transcation Id */
rsp->sessionId = smesessionId;
rsp->transactionId = smetransactionId;
mmhMsg.type = eWNI_SME_ADDTS_RSP;
mmhMsg.bodyptr = rsp;

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

@ -154,11 +154,25 @@ void
lim_send_sme_aggr_qos_rsp(struct mac_context *mac, tpSirAggrQosRsp aggrQosRsp,
uint8_t smesessionId);
/**
* lim_send_sme_addts_rsp() - sends SME ADDTS RSP
* @mac: global mac structure
* @rspReqd: is SmeAddTsRsp required
* @status: status code of SME_ADD_TS_RSP
* @pe_session: The PE session associated with the connection
* @tspec: The TSpec that was added
* @smesessionId: ID of the SME session associated with the connection
*
* This function sends a eWNI_SME_ADDTS_RSP to upper layer
*
* Return: None
*/
void lim_send_sme_addts_rsp(struct mac_context *mac,
uint8_t rspReqd, uint32_t status,
struct pe_session *pe_session,
struct mac_tspec_ie tspec,
uint8_t smesessionId, uint16_t smetransactionId);
uint8_t smesessionId);
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);