From 167ea82cabfde9576febc36cf50e30c31e5af391 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Thu, 21 Mar 2019 17:19:30 -0700 Subject: [PATCH] qcacld-3.0: Replace WME_AC_* macros with QCA_WLAN_AC_* Replace WME_AC_* macros with QCA_WLAN_AC_*. Change-Id: I359a8afa48ae6697df41d8f832195c918d57e0ae CRs-Fixed: 2421732 --- components/fw_offload/dispatcher/inc/cfg_fwol_generic.h | 8 ++++---- core/hdd/src/wlan_hdd_hostapd_wext.c | 2 +- core/hdd/src/wlan_hdd_wext.c | 2 +- core/wma/src/wma_mgmt.c | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/components/fw_offload/dispatcher/inc/cfg_fwol_generic.h b/components/fw_offload/dispatcher/inc/cfg_fwol_generic.h index 17fd1246ee36..627aab0471f9 100644 --- a/components/fw_offload/dispatcher/inc/cfg_fwol_generic.h +++ b/components/fw_offload/dispatcher/inc/cfg_fwol_generic.h @@ -96,10 +96,10 @@ * Firmware by default categorizes ARP packets with VOICE TID. * This ini shall be used to override the default configuration. * Access category enums are referenced in ieee80211_common.h - * WME_AC_BE = 0 (Best effort) - * WME_AC_BK = 1 (Background) - * WME_AC_VI = 2 (Video) - * WME_AC_VO = 3 (Voice) + * QCA_WLAN_AC_BE = 0 (Best effort) + * QCA_WLAN_AC_BK = 1 (Background) + * QCA_WLAN_AC_VI = 2 (Video) + * QCA_WLAN_AC_VO = 3 (Voice) * * Related: none * diff --git a/core/hdd/src/wlan_hdd_hostapd_wext.c b/core/hdd/src/wlan_hdd_hostapd_wext.c index f49a66a19dfe..a50df9f5fee6 100644 --- a/core/hdd/src/wlan_hdd_hostapd_wext.c +++ b/core/hdd/src/wlan_hdd_hostapd_wext.c @@ -2366,7 +2366,7 @@ static int __iw_softap_get_ba_timeout(struct net_device *dev, { int errno; uint8_t ac_cat = 4; - uint32_t duration[WME_AC_MAX], i; + uint32_t duration[QCA_WLAN_AC_ALL], i; void *soc = cds_get_context(QDF_MODULE_ID_SOC); struct hdd_adapter *adapter; struct hdd_context *hdd_ctx; diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index bb749aa793ca..a3923884694e 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -7095,7 +7095,7 @@ static int __iw_get_char_setnone(struct net_device *dev, case WE_GET_BA_AGEING_TIMEOUT: { uint8_t ac_cat = 4; - uint32_t duration[WME_AC_MAX], i; + uint32_t duration[QCA_WLAN_AC_ALL], i; void *soc = cds_get_context(QDF_MODULE_ID_SOC); if (!soc) { diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c index 1be3b08210f9..3b5d52ba84f7 100644 --- a/core/wma/src/wma_mgmt.c +++ b/core/wma/src/wma_mgmt.c @@ -2639,16 +2639,16 @@ QDF_STATUS wma_process_update_edca_param_req(WMA_HANDLE handle, for (ac = 0; ac < WME_NUM_AC; ac++) { switch (ac) { - case WME_AC_BE: + case QCA_WLAN_AC_BE: edca_record = &edca_params->acbe; break; - case WME_AC_BK: + case QCA_WLAN_AC_BK: edca_record = &edca_params->acbk; break; - case WME_AC_VI: + case QCA_WLAN_AC_VI: edca_record = &edca_params->acvi; break; - case WME_AC_VO: + case QCA_WLAN_AC_VO: edca_record = &edca_params->acvo; break; default: