From 19931aa1ee201b1ac56f92bc79ff55bf4a2a16b2 Mon Sep 17 00:00:00 2001 From: Govind Singh Date: Tue, 13 Jun 2017 16:53:26 +0530 Subject: [PATCH] qcacld-3.0: Use host defined wmm params in wma layer WMA layer needs to use host defined target params as direct access of wmi target definition is not allowed. Use host defined wmm params in wma layer. Change-Id: I8af9c7802c20ce88a6fa158db5acab018807506e CRs-Fixed: 2072166 --- core/wma/inc/wma_internal.h | 2 +- core/wma/src/wma_mgmt.c | 2 +- core/wma/src/wma_power.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/wma/inc/wma_internal.h b/core/wma/inc/wma_internal.h index 91eebb8c2767..a22f034f6fae 100644 --- a/core/wma/inc/wma_internal.h +++ b/core/wma/inc/wma_internal.h @@ -696,7 +696,7 @@ QDF_STATUS wma_set_ap_peer_uapsd(tp_wma_handle wma, uint32_t vdev_id, uint8_t max_sp); void wma_update_edca_params_for_ac(tSirMacEdcaParamRecord *edca_param, - wmi_wmm_vparams *wmm_param, int ac); + struct wmi_host_wme_vparams *wmm_param, int ac); void wma_set_tx_power(WMA_HANDLE handle, tMaxTxPowerParams *tx_pwr_params); diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c index 2b856425a173..e77331df20fb 100644 --- a/core/wma/src/wma_mgmt.c +++ b/core/wma/src/wma_mgmt.c @@ -2237,7 +2237,7 @@ QDF_STATUS wma_process_update_edca_param_req(WMA_HANDLE handle, tEdcaParams *edca_params) { tp_wma_handle wma_handle = (tp_wma_handle) handle; - wmi_wmm_vparams wmm_param[WME_NUM_AC]; + struct wmi_host_wme_vparams wmm_param[WME_NUM_AC]; tSirMacEdcaParamRecord *edca_record; int ac; struct cdp_pdev *pdev; diff --git a/core/wma/src/wma_power.c b/core/wma/src/wma_power.c index 178b12daa2aa..440ffe9af902 100644 --- a/core/wma/src/wma_power.c +++ b/core/wma/src/wma_power.c @@ -318,7 +318,7 @@ QDF_STATUS wma_set_ap_peer_uapsd(tp_wma_handle wma, uint32_t vdev_id, * Return: none */ void wma_update_edca_params_for_ac(tSirMacEdcaParamRecord *edca_param, - wmi_wmm_vparams *wmm_param, int ac) + struct wmi_host_wme_vparams *wmm_param, int ac) { #define WMA_WMM_EXPO_TO_VAL(val) ((1 << (val)) - 1) wmm_param->cwmin = WMA_WMM_EXPO_TO_VAL(edca_param->cw.min); @@ -328,11 +328,11 @@ void wma_update_edca_params_for_ac(tSirMacEdcaParamRecord *edca_param, wmm_param->acm = edca_param->aci.acm; /* TODO: No ack is not present in EdcaParamRecord */ - wmm_param->no_ack = 0; + wmm_param->noackpolicy = 0; WMA_LOGD("WMM PARAMS AC[%d]: AIFS %d Min %d Max %d TXOP %d ACM %d NOACK %d", ac, wmm_param->aifs, wmm_param->cwmin, wmm_param->cwmax, - wmm_param->txoplimit, wmm_param->acm, wmm_param->no_ack); + wmm_param->txoplimit, wmm_param->acm, wmm_param->noackpolicy); } /**