From cd7d5a7b017c1c2b901b1ed53845577b764e96c2 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Fri, 8 Feb 2019 13:33:54 -0800 Subject: [PATCH] qcacld-3.0: Remove UAPSD trigger structs from TDLS public 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 duplicates and exclusive use the structs from qcacmn wmi_unified_param.h. This is co-dependent upon Ida0f2b6f131ff2dce7217b881ffadecfd685f563 ("qcacmn: Remove TDLS featurization from UAPSD trigger structs"). Change-Id: I37b2d80a4710aced158dcf2ea973d15801a7cecc CRs-Fixed: 2395823 --- .../dispatcher/inc/wlan_tdls_public_structs.h | 30 ------------------- 1 file changed, 30 deletions(-) diff --git a/tdls/dispatcher/inc/wlan_tdls_public_structs.h b/tdls/dispatcher/inc/wlan_tdls_public_structs.h index 61ae90552a..18cd019ce2 100644 --- a/tdls/dispatcher/inc/wlan_tdls_public_structs.h +++ b/tdls/dispatcher/inc/wlan_tdls_public_structs.h @@ -926,36 +926,6 @@ enum tspec_dir_type { BI_DIR = 2, }; -/** - * struct sta_uapsd_params - uapsd auto trig params - * @wmm_ac: WMM access category from 0 to 3 - * @user_priority: User priority to use in trigger frames - * @service_interval: service interval - * @suspend_interval: suspend interval - * @delay_interval: delay interval - */ -struct sta_uapsd_params { - uint32_t wmm_ac; - uint32_t user_priority; - uint32_t service_interval; - uint32_t suspend_interval; - uint32_t delay_interval; -}; - -/** - * struct sta_uapsd_trig_params - uapsd trigger parameter - * @vdevid: vdev id - * @peer_addr: peer address - * @auto_triggerparam: trigger parameters - * @num_ac: no of access category - */ -struct sta_uapsd_trig_params { - uint32_t vdevid; - uint8_t peer_addr[QDF_MAC_ADDR_SIZE]; - struct sta_uapsd_params *auto_triggerparam; - uint32_t num_ac; -}; - /** * struct tdls_event_info - firmware tdls event * @vdev_id: vdev id