From e2da578fb7c38e6ea94943a0994e124cc0ecbb8a Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sun, 20 Jan 2019 09:58:07 -0800 Subject: [PATCH] qcacld-3.0: Align with the refined struct add_ts_param Change I421b670b86a7e1cecbe5a2686efefbbb6c455267 ("qcacmn: Refine struct add_ts_param") is updating struct add_ts_param, so update the legacy project to align with those changes. Note that these are interdependent changes. Change-Id: I829ad0abb864f0a05047894bab9977d8529074dc CRs-Fixed: 2433928 --- core/mac/src/pe/lim/lim_admit_control.c | 17 +++++++++-------- core/mac/src/pe/lim/lim_ft.c | 11 ++++++----- core/wma/src/wma_features.c | 2 +- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/core/mac/src/pe/lim/lim_admit_control.c b/core/mac/src/pe/lim/lim_admit_control.c index c39c02087d60..1cb0f338cbe4 100644 --- a/core/mac/src/pe/lim/lim_admit_control.c +++ b/core/mac/src/pe/lim/lim_admit_control.c @@ -834,11 +834,11 @@ lim_send_hal_msg_add_ts(struct mac_context *mac, if (!pAddTsParam) return QDF_STATUS_E_NOMEM; - pAddTsParam->staIdx = staIdx; - pAddTsParam->tspecIdx = tspecIdx; + pAddTsParam->sta_idx = staIdx; + pAddTsParam->tspec_idx = tspecIdx; qdf_mem_copy(&pAddTsParam->tspec, &tspecIE, sizeof(struct mac_tspec_ie)); - pAddTsParam->sessionId = sessionId; + pAddTsParam->pe_session_id = sessionId; pAddTsParam->vdev_id = pe_session->smeSessionId; #ifdef FEATURE_WLAN_ESE @@ -847,7 +847,7 @@ lim_send_hal_msg_add_ts(struct mac_context *mac, #ifdef WLAN_FEATURE_ROAM_OFFLOAD if (mac->mlme_cfg->lfr.lfr3_roaming_offload && pe_session->is11Rconnection) - pAddTsParam->setRICparams = 1; + pAddTsParam->set_ric_params = true; #endif msg.type = WMA_ADD_TS_REQ; @@ -969,11 +969,12 @@ void lim_process_hal_add_ts_rsp(struct mac_context *mac, /* 090803: Use pe_find_session_by_session_id() to obtain the PE session context */ /* from the sessionId in the Rsp Msg from HAL */ - pe_session = pe_find_session_by_session_id(mac, pAddTsRspMsg->sessionId); + pe_session = pe_find_session_by_session_id(mac, + pAddTsRspMsg->pe_session_id); if (!pe_session) { pe_err("Session does Not exist with given sessionId: %d", - pAddTsRspMsg->sessionId); + pAddTsRspMsg->pe_session_id); lim_send_sme_addts_rsp(mac, rspReqd, eSIR_SME_ADDTS_RSP_FAILED, pe_session, pAddTsRspMsg->tspec, mac->lim.gLimAddtsReq.sessionId); @@ -1000,14 +1001,14 @@ void lim_process_hal_add_ts_rsp(struct mac_context *mac, /* Delete TSPEC */ /* 090803: Pull the hash table from the session */ - pSta = dph_lookup_assoc_id(mac, pAddTsRspMsg->staIdx, &assocId, + pSta = dph_lookup_assoc_id(mac, pAddTsRspMsg->sta_idx, &assocId, &pe_session->dph.dphHashTable); if (pSta) lim_admit_control_delete_ts(mac, assocId, &pAddTsRspMsg->tspec.tsinfo, NULL, (uint8_t *) &pAddTsRspMsg-> - tspecIdx); + tspec_idx); /* Send SME_ADDTS_RSP */ /* 090803: Use the smesessionId and smetransactionId from the PE session context */ diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c index d2a3f392b523..f0150c951195 100644 --- a/core/mac/src/pe/lim/lim_ft.c +++ b/core/mac/src/pe/lim/lim_ft.c @@ -890,23 +890,24 @@ void lim_process_ft_aggr_qos_rsp(struct mac_context *mac, if ((((1 << i) & pAggrQosRspMsg->tspecIdx)) && (pAggrQosRspMsg->status[i] != QDF_STATUS_SUCCESS)) { sir_copy_mac_addr(peerMacAddr, pe_session->bssId); - addTsParam.staIdx = pAggrQosRspMsg->staIdx; - addTsParam.sessionId = pAggrQosRspMsg->sessionId; + addTsParam.sta_idx = pAggrQosRspMsg->staIdx; + addTsParam.pe_session_id = pAggrQosRspMsg->sessionId; addTsParam.tspec = pAggrQosRspMsg->tspec[i]; - addTsParam.tspecIdx = pAggrQosRspMsg->tspecIdx; + addTsParam.tspec_idx = pAggrQosRspMsg->tspecIdx; lim_send_delts_req_action_frame(mac, peerMacAddr, rspReqd, &addTsParam.tspec.tsinfo, &addTsParam.tspec, pe_session); pSta = - dph_lookup_assoc_id(mac, addTsParam.staIdx, &assocId, + dph_lookup_assoc_id(mac, addTsParam.sta_idx, + &assocId, &pe_session->dph.dphHashTable); if (pSta) { lim_admit_control_delete_ts(mac, assocId, &addTsParam.tspec. tsinfo, NULL, (uint8_t *) & - addTsParam.tspecIdx); + addTsParam.tspec_idx); } } } diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index 3aa02cab65e2..12ac0f507a3c 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -3066,7 +3066,7 @@ void wma_add_ts_req(tp_wma_handle wma, struct add_ts_param *msg) msg->status = QDF_STATUS_E_FAILURE; #ifdef WLAN_FEATURE_ROAM_OFFLOAD - if (msg->setRICparams == true) + if (msg->set_ric_params) wma_set_ric_req(wma, msg, true); #endif /* WLAN_FEATURE_ROAM_OFFLOAD */