From f5ccbf66e6354317b9250be9291f9b7d74da3b4b Mon Sep 17 00:00:00 2001 From: Sandeep Puligilla Date: Mon, 26 Mar 2018 16:37:05 -0700 Subject: [PATCH] qcacld-3.0: Deprecate enum wmi_dwelltime_adaptive_mode Deprecate enum wmi_dwelltime_adaptive_mode and use enum scan_dwelltime_adaptive_mode defined in scan component. Change-Id: I9c33b852172d9208fb8440c6dc71a12aefd717da CRs-Fixed: 2213150 --- core/hdd/inc/wlan_hdd_cfg.h | 24 ++++++++++++------------ core/mac/inc/sir_api.h | 4 ++-- core/sme/inc/csr_api.h | 7 ++++--- core/sme/inc/csr_internal.h | 8 ++++---- core/sme/src/rrm/sme_rrm.c | 2 +- 5 files changed, 23 insertions(+), 22 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h index 0800ee2f0a41..8526201a538b 100644 --- a/core/hdd/inc/wlan_hdd_cfg.h +++ b/core/hdd/inc/wlan_hdd_cfg.h @@ -1293,7 +1293,7 @@ enum hdd_dot11_mode { * * This ini will set the algo used in dwell time optimization * during host scan with connection. - * See enum wmi_dwelltime_adaptive_mode. + * See enum scan_dwelltime_adaptive_mode. * Acceptable values for this: * 0: Default (Use firmware default mode) * 1: Conservative optimization @@ -1324,7 +1324,7 @@ enum hdd_dot11_mode { * * This ini will set the algo used in dwell time optimization * during host scan without connection. - * See enum wmi_dwelltime_adaptive_mode. + * See enum scan_dwelltime_adaptive_mode. * Acceptable values for this: * 0: Default (Use firmware default mode) * 1: Conservative optimization @@ -1354,7 +1354,7 @@ enum hdd_dot11_mode { * @Default: 1 * * This ini will set the algo used in dwell time optimization - * during ext scan. see enum wmi_dwelltime_adaptive_mode. + * during ext scan. see enum scan_dwelltime_adaptive_mode. * Acceptable values for this: * 0: Default (Use firmware default mode) * 1: Conservative optimization @@ -1384,7 +1384,7 @@ enum hdd_dot11_mode { * @Default: 1 * * This ini will set the algo used in dwell time optimization - * during pno scan. see enum wmi_dwelltime_adaptive_mode. + * during pno scan. see enum scan_dwelltime_adaptive_mode. * Acceptable values for this: * 0: Default (Use firmware default mode) * 1: Conservative optimization @@ -1441,7 +1441,7 @@ enum hdd_dot11_mode { * * This parameter will set default adaptive mode, will be used if any of the * scan dwell mode is set to default. - * For uses : see enum wmi_dwelltime_adaptive_mode + * For uses : see enum scan_dwelltime_adaptive_mode * * Related: None * @@ -2161,7 +2161,7 @@ enum hdd_dot11_mode { * @Default: 1 * * This parameter will set the algo used in dwell time optimization during - * roam scan. see enum wmi_dwelltime_adaptive_mode. + * roam scan. see enum scan_dwelltime_adaptive_mode. * Acceptable values for this: * 0: Default (Use firmware default mode) * 1: Conservative optimization @@ -15064,12 +15064,12 @@ struct hdd_config { bool enable_dp_trace; uint8_t dp_trace_config[DP_TRACE_CONFIG_STRING_LENGTH]; bool adaptive_dwell_mode_enabled; - enum wmi_dwelltime_adaptive_mode scan_adaptive_dwell_mode; - enum wmi_dwelltime_adaptive_mode scan_adaptive_dwell_mode_nc; - enum wmi_dwelltime_adaptive_mode roamscan_adaptive_dwell_mode; - enum wmi_dwelltime_adaptive_mode extscan_adaptive_dwell_mode; - enum wmi_dwelltime_adaptive_mode pnoscan_adaptive_dwell_mode; - enum wmi_dwelltime_adaptive_mode global_adapt_dwelltime_mode; + enum scan_dwelltime_adaptive_mode scan_adaptive_dwell_mode; + enum scan_dwelltime_adaptive_mode scan_adaptive_dwell_mode_nc; + enum scan_dwelltime_adaptive_mode roamscan_adaptive_dwell_mode; + enum scan_dwelltime_adaptive_mode extscan_adaptive_dwell_mode; + enum scan_dwelltime_adaptive_mode pnoscan_adaptive_dwell_mode; + enum scan_dwelltime_adaptive_mode global_adapt_dwelltime_mode; uint8_t adapt_dwell_lpf_weight; uint8_t adapt_dwell_passive_mon_intval; uint8_t adapt_dwell_wifi_act_threshold; diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index 059138ac19b9..46827d99901c 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -3084,7 +3084,7 @@ typedef struct sSirRoamOffloadScanReq { uint8_t early_stop_scan_enable; int8_t early_stop_scan_min_threshold; int8_t early_stop_scan_max_threshold; - enum wmi_dwelltime_adaptive_mode roamscan_adaptive_dwell_mode; + enum scan_dwelltime_adaptive_mode roamscan_adaptive_dwell_mode; tSirAddie assoc_ie; struct lca_disallow_config_params lca_config_params; struct scoring_param score_params; @@ -4463,7 +4463,7 @@ typedef struct { uint32_t min_dwell_time_passive; uint32_t max_dwell_time_passive; uint32_t configuration_flags; - enum wmi_dwelltime_adaptive_mode extscan_adaptive_dwell_mode; + enum scan_dwelltime_adaptive_mode extscan_adaptive_dwell_mode; tSirWifiScanBucketSpec buckets[WLAN_EXTSCAN_MAX_BUCKETS]; } tSirWifiScanCmdReqParams, *tpSirWifiScanCmdReqParams; diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h index 92c62a550c64..ffb5bef3bcfb 100644 --- a/core/sme/inc/csr_api.h +++ b/core/sme/inc/csr_api.h @@ -37,6 +37,7 @@ #include "sir_api.h" #include "sir_mac_prot_def.h" #include "csr_link_list.h" +#include "wlan_scan_public_structs.h" #define CSR_INVALID_SCANRESULT_HANDLE (NULL) #define CSR_NUM_WLM_LATENCY_LEVEL 4 @@ -1282,9 +1283,9 @@ typedef struct tagCsrConfigParam { uint32_t edca_bk_aifs; uint32_t edca_be_aifs; bool enable_fatal_event; - enum wmi_dwelltime_adaptive_mode scan_adaptive_dwell_mode; - enum wmi_dwelltime_adaptive_mode scan_adaptive_dwell_mode_nc; - enum wmi_dwelltime_adaptive_mode roamscan_adaptive_dwell_mode; + enum scan_dwelltime_adaptive_mode scan_adaptive_dwell_mode; + enum scan_dwelltime_adaptive_mode scan_adaptive_dwell_mode_nc; + enum scan_dwelltime_adaptive_mode roamscan_adaptive_dwell_mode; struct csr_sta_roam_policy_params sta_roam_policy_params; uint32_t tx_aggregation_size; uint32_t rx_aggregation_size; diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index 1f60078ddefc..06c43798e5dd 100644 --- a/core/sme/inc/csr_internal.h +++ b/core/sme/inc/csr_internal.h @@ -39,7 +39,7 @@ #include "qdf_mc_timer.h" #include "csr_support.h" #include "cds_reg_service.h" - +#include "wlan_scan_public_structs.h" #include "csr_neighbor_roam.h" #include "sir_types.h" @@ -582,9 +582,9 @@ struct csr_config { uint32_t edca_be_aifs; bool enable_fatal_event; bool vendor_vht_sap; - enum wmi_dwelltime_adaptive_mode scan_adaptive_dwell_mode; - enum wmi_dwelltime_adaptive_mode scan_adaptive_dwell_mode_nc; - enum wmi_dwelltime_adaptive_mode roamscan_adaptive_dwell_mode; + enum scan_dwelltime_adaptive_mode scan_adaptive_dwell_mode; + enum scan_dwelltime_adaptive_mode scan_adaptive_dwell_mode_nc; + enum scan_dwelltime_adaptive_mode roamscan_adaptive_dwell_mode; struct csr_sta_roam_policy_params sta_roam_policy; uint32_t tx_aggregation_size; uint32_t rx_aggregation_size; diff --git a/core/sme/src/rrm/sme_rrm.c b/core/sme/src/rrm/sme_rrm.c index 2e514907ac69..87dd379f6da9 100644 --- a/core/sme/src/rrm/sme_rrm.c +++ b/core/sme/src/rrm/sme_rrm.c @@ -774,7 +774,7 @@ static QDF_STATUS sme_rrm_issue_scan_req(tpAniSirGlobal mac_ctx) max_chan_time); } - req->scan_req.adaptive_dwell_time_mode = WMI_DWELL_MODE_STATIC; + req->scan_req.adaptive_dwell_time_mode = SCAN_DWELL_MODE_STATIC; /* * For RRM scans timing is very important especially when the * request is for limited channels. There is no need for