mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-13 16:16:15 -04:00
Merge "qcacld-3.0: Remove obsolete "flex connect" configuration" into wlan-cld3.driver.lnx.1.1-dev
This commit is contained in:
commit
b262de76ca
5 changed files with 0 additions and 40 deletions
|
|
@ -2011,15 +2011,6 @@ typedef enum {
|
|||
#define CFG_ENABLE_FAST_ROAM_IN_CONCURRENCY_MAX (1)
|
||||
#define CFG_ENABLE_FAST_ROAM_IN_CONCURRENCY_DEFAULT (1)
|
||||
|
||||
/*
|
||||
* FlexConnectPowerFactor parameter
|
||||
* Default: Disable (0)
|
||||
*/
|
||||
#define CFG_FLEX_CONNECT_POWER_FACTOR_NAME "gFlexConnectPowerFactor"
|
||||
#define CFG_FLEX_CONNECT_POWER_FACTOR_MIN (0)
|
||||
#define CFG_FLEX_CONNECT_POWER_FACTOR_MAX (9)
|
||||
#define CFG_FLEX_CONNECT_POWER_FACTOR_DEFAULT (0)
|
||||
|
||||
/*
|
||||
* Enable heart beat monitoring offload to FW
|
||||
*/
|
||||
|
|
@ -3878,7 +3869,6 @@ struct hdd_config {
|
|||
/* Flag indicating whether legacy fast roam during concurrency is enabled in cfg.ini or not */
|
||||
bool bFastRoamInConIniFeatureEnabled;
|
||||
bool fEnableAdaptRxDrain;
|
||||
uint8_t flexConnectPowerFactor;
|
||||
bool enableIbssHeartBeatOffload;
|
||||
uint32_t antennaDiversity;
|
||||
bool fEnableSNRMonitoring;
|
||||
|
|
|
|||
|
|
@ -2523,13 +2523,6 @@ REG_TABLE_ENTRY g_registry_table[] = {
|
|||
CFG_ENABLE_ADAPT_RX_DRAIN_MIN,
|
||||
CFG_ENABLE_ADAPT_RX_DRAIN_MAX),
|
||||
|
||||
REG_VARIABLE(CFG_FLEX_CONNECT_POWER_FACTOR_NAME, WLAN_PARAM_Integer,
|
||||
struct hdd_config, flexConnectPowerFactor,
|
||||
VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_MINMAX,
|
||||
CFG_FLEX_CONNECT_POWER_FACTOR_DEFAULT,
|
||||
CFG_FLEX_CONNECT_POWER_FACTOR_MIN,
|
||||
CFG_FLEX_CONNECT_POWER_FACTOR_MAX),
|
||||
|
||||
REG_VARIABLE(CFG_ENABLE_HEART_BEAT_OFFLOAD, WLAN_PARAM_Integer,
|
||||
struct hdd_config, enableIbssHeartBeatOffload,
|
||||
VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
|
||||
|
|
@ -5255,10 +5248,6 @@ void hdd_cfg_print(hdd_context_t *pHddCtx)
|
|||
QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
|
||||
"Name = [gEnableVhtFor24GHzBand] Value = [%u] ",
|
||||
pHddCtx->config->enableVhtFor24GHzBand);
|
||||
|
||||
QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
|
||||
"Name = [gFlexConnectPowerFactor] Value = [%u] ",
|
||||
pHddCtx->config->flexConnectPowerFactor);
|
||||
QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
|
||||
"Name = [gEnableIbssHeartBeatOffload] Value = [%u] ",
|
||||
pHddCtx->config->enableIbssHeartBeatOffload);
|
||||
|
|
@ -6784,14 +6773,6 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx)
|
|||
"Could not pass on WNI_CFG_ENABLE_ADAPT_RX_DRAIN to CFG");
|
||||
}
|
||||
|
||||
if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_FLEX_CONNECT_POWER_FACTOR,
|
||||
pConfig->flexConnectPowerFactor) ==
|
||||
QDF_STATUS_E_FAILURE) {
|
||||
fStatus = false;
|
||||
hddLog(LOGE, "Failure: Could not pass on "
|
||||
"WNI_CFG_FLEX_CONNECT_POWER_FACTOR to CFG");
|
||||
}
|
||||
|
||||
if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_ANTENNA_DIVESITY,
|
||||
pConfig->antennaDiversity) ==
|
||||
QDF_STATUS_E_FAILURE) {
|
||||
|
|
|
|||
|
|
@ -232,7 +232,6 @@ enum {
|
|||
WNI_CFG_PMF_SA_QUERY_MAX_RETRIES,
|
||||
WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL,
|
||||
WNI_CFG_ENABLE_ADAPT_RX_DRAIN,
|
||||
WNI_CFG_FLEX_CONNECT_POWER_FACTOR,
|
||||
WNI_CFG_ANTENNA_DIVESITY,
|
||||
WNI_CFG_GO_LINK_MONITOR_TIMEOUT,
|
||||
WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY,
|
||||
|
|
@ -1184,10 +1183,6 @@ enum {
|
|||
#define WNI_CFG_ENABLE_ADAPT_RX_DRAIN_STAMAX 1
|
||||
#define WNI_CFG_ENABLE_ADAPT_RX_DRAIN_STADEF 1
|
||||
|
||||
#define WNI_CFG_FLEX_CONNECT_POWER_FACTOR_STAMIN 0
|
||||
#define WNI_CFG_FLEX_CONNECT_POWER_FACTOR_STAMAX 9
|
||||
#define WNI_CFG_FLEX_CONNECT_POWER_FACTOR_STADEF 0
|
||||
|
||||
#define WNI_CFG_ANTENNA_DIVESITY_STAMIN 0
|
||||
#define WNI_CFG_ANTENNA_DIVESITY_STAMAX 3
|
||||
#define WNI_CFG_ANTENNA_DIVESITY_STADEF 0
|
||||
|
|
|
|||
|
|
@ -304,7 +304,6 @@ unsigned char *g_cfg_param_name[] = {
|
|||
(unsigned char *)"PMF_SA_QUERY_MAX_RETRIES",
|
||||
(unsigned char *)"PMF_SA_QUERY_RETRY_INTERVAL",
|
||||
(unsigned char *)"ENABLE_ADAPT_RX_DRAIN",
|
||||
(unsigned char *)"FLEX_CONNECT_POWER_FACTOR",
|
||||
(unsigned char *)"ANTENNA_DIVESITY",
|
||||
(unsigned char *)"GO_LINK_MONITOR_TIMEOUT",
|
||||
(unsigned char *)"RMC_ACTION_PERIOD_FREQUENCY",
|
||||
|
|
|
|||
|
|
@ -1072,11 +1072,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
|
|||
WNI_CFG_ENABLE_ADAPT_RX_DRAIN_STAMIN,
|
||||
WNI_CFG_ENABLE_ADAPT_RX_DRAIN_STAMAX,
|
||||
WNI_CFG_ENABLE_ADAPT_RX_DRAIN_STADEF},
|
||||
{WNI_CFG_FLEX_CONNECT_POWER_FACTOR,
|
||||
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
|
||||
WNI_CFG_FLEX_CONNECT_POWER_FACTOR_STAMIN,
|
||||
WNI_CFG_FLEX_CONNECT_POWER_FACTOR_STAMAX,
|
||||
WNI_CFG_FLEX_CONNECT_POWER_FACTOR_STADEF},
|
||||
{WNI_CFG_ANTENNA_DIVESITY,
|
||||
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
|
||||
CFG_CTL_NTF_HAL,
|
||||
|
|
|
|||
Loading…
Reference in a new issue