From 9933bb2233b112fe3b10a643fd0e50b5b8fcc13e Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Fri, 8 Feb 2019 13:35:22 -0800 Subject: [PATCH] qcacmn: Remove TDLS featurization from UAPSD trigger structs As part of the TDLS feature, structs sta_uapsd_trig_params and sta_uapsd_params were replicated from qcacmn wmi_unified_param.h to qcacld-3.0 wlan_tdls_public_structs.h, and conditional compilation based upon CONVERGED_TDLS_ENABLE was used to determine which structs are actually used by a build. Since these structs are not specific to TDLS, remove the featurization so that the structs from qcacmn wmi_unified_param.h are always used. This is co-dependent upon I37b2d80a4710aced158dcf2ea973d15801a7cecc ("qcacld-3.0: Remove UAPSD trigger structs from TDLS public structs"). Change-Id: Ida0f2b6f131ff2dce7217b881ffadecfd685f563 CRs-Fixed: 2395822 --- wmi/inc/wmi_unified_param.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/wmi/inc/wmi_unified_param.h b/wmi/inc/wmi_unified_param.h index d1e55d4eaaa9..2f85c2d573df 100644 --- a/wmi/inc/wmi_unified_param.h +++ b/wmi/inc/wmi_unified_param.h @@ -1570,7 +1570,6 @@ struct wmi_offchan_data_tx_params { bool tx_params_valid; }; -#ifndef CONVERGED_TDLS_ENABLE /** * struct sta_uapsd_params - uapsd auto trig params * @wmm_ac: WMM access category from 0 to 3 @@ -1600,7 +1599,6 @@ struct sta_uapsd_trig_params { struct sta_uapsd_params *auto_triggerparam; uint32_t num_ac; }; -#endif #define WMI_NUM_AC (4) #define WMI_MAX_NUM_AC 4