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
This commit is contained in:
Sandeep Puligilla 2018-03-26 16:37:05 -07:00 • committed by nshrivas
commit f5ccbf66e6
5 changed files with 23 additions and 22 deletions

View file

@ -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;

View file

@ -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;

View file

@ -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;

View file

@ -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;

View file

@ -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