A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-09 13:49:24 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Cleanup legacy codes for six WNI cfg and three INI cfg

Browse source 
Since have refactored below configures, cleanup legacy codes.
 - WNI_CFG_APSD_ENABLED
 - WNI_CFG_OBSS_DETECTION_OFFLOAD
 - WNI_CFG_OBSS_COLOR_COLLISION_OFFLOAD
 - WNI_CFG_CURRENT_TX_POWER_LEVEL
 - WNI_CFG_LOCAL_POWER_CONSTRAINT
 - WNI_CFG_PS_WOW_DATA_INACTIVITY_TIMEOUT
 - g_wow_data_inactivity_timeout
 - gTxPowerCap
 - gDisablePacketFilter

Change-Id: I40410d0d9fe0e3f90206f07e3f437359f2a8d1e4
CRs-Fixed: 2375869
This commit is contained in:
Wu Gao 2019-01-04 15:59:09 +08:00 • committed by nshrivas
commit abdbbd0ccf
9 changed files with 0 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

53
core/hdd/inc/wlan_hdd_cfg.h
View file

@ -564,55 +564,6 @@ enum hdd_dot11_mode {
#define CFG_AP_ENABLE_PROTECTION_MODE_MAX (1)
#define CFG_AP_ENABLE_PROTECTION_MODE_DEFAULT (1)
#define CFG_DISABLE_PACKET_FILTER "gDisablePacketFilter"
#define CFG_DISABLE_PACKET_FILTER_MIN (0)
#define CFG_DISABLE_PACKET_FILTER_MAX (1)
#define CFG_DISABLE_PACKET_FILTER_DEFAULT (1)
/*
* <ini>
* gTxPowerCap - WLAN max tx power
* @Min: 0
* @Max: 128
* @Default: 128
*
* This ini is used to configure the device max tx power.
*
* Related: None.
*
* Supported Feature: Concurrency
*
* Usage: Internal/External
*
* </ini>
*/
#define CFG_MAX_TX_POWER_NAME "gTxPowerCap"
#define CFG_MAX_TX_POWER_MIN WNI_CFG_CURRENT_TX_POWER_LEVEL_STAMIN
#define CFG_MAX_TX_POWER_MAX WNI_CFG_CURRENT_TX_POWER_LEVEL_STAMAX
/* Not to use CFG default because if no registry setting, this is ignored by SME. */
#define CFG_MAX_TX_POWER_DEFAULT WNI_CFG_CURRENT_TX_POWER_LEVEL_STAMAX
/*
* <ini>
* g_wow_data_inactivity_timeout - Data activity timeout in wow mode.
* @Min: 1
* @Max: 255
* @Default: 50
*
* This ini is used to set data inactivity timeout in wow mode.
*
* Supported Feature: inactivity timeout in wow mode
*
* Usage: External
*
* </ini>
*/
#define CFG_WOW_DATA_INACTIVITY_TIMEOUT_NAME "g_wow_data_inactivity_timeout"
#define CFG_WOW_DATA_INACTIVITY_TIMEOUT_MIN (1)
#define CFG_WOW_DATA_INACTIVITY_TIMEOUT_MAX (255)
#define CFG_WOW_DATA_INACTIVITY_TIMEOUT_DEFAULT (50)
/* WMM configuration */
/*
* <ini>
@ -1139,15 +1090,11 @@ struct hdd_config {
uint32_t nChannelBondingMode24GHz;
uint32_t nChannelBondingMode5GHz;
bool apProtEnabled;
uint8_t nTxPowerCap; /* In dBm */
uint8_t disablePacketFilter;
#ifdef FEATURE_WLAN_DYNAMIC_CVM
/* Bitmap for operating voltage corner mode */
uint32_t vc_mode_cfg_bitmap;
#endif
uint8_t wow_data_inactivity_timeout;
uint32_t DelayedTriggerFrmInt;
#ifdef FEATURE_WLAN_SCAN_PNO

32
core/hdd/src/wlan_hdd_cfg.c
View file

@ -84,30 +84,6 @@ struct reg_table_entry g_registry_table[] = {
CFG_AP_ENABLE_PROTECTION_MODE_MIN,
CFG_AP_ENABLE_PROTECTION_MODE_MAX),
REG_VARIABLE(CFG_DISABLE_PACKET_FILTER, WLAN_PARAM_Integer,
struct hdd_config, disablePacketFilter,
VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
CFG_DISABLE_PACKET_FILTER_DEFAULT,
CFG_DISABLE_PACKET_FILTER_MIN,
CFG_DISABLE_PACKET_FILTER_MAX),
REG_VARIABLE(CFG_MAX_TX_POWER_NAME, WLAN_PARAM_Integer,
struct hdd_config, nTxPowerCap,
VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
CFG_MAX_TX_POWER_DEFAULT,
CFG_MAX_TX_POWER_MIN,
CFG_MAX_TX_POWER_MAX),
REG_VARIABLE(CFG_WOW_DATA_INACTIVITY_TIMEOUT_NAME, WLAN_PARAM_Integer,
struct hdd_config, wow_data_inactivity_timeout,
VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
CFG_WOW_DATA_INACTIVITY_TIMEOUT_DEFAULT,
CFG_WOW_DATA_INACTIVITY_TIMEOUT_MIN,
CFG_WOW_DATA_INACTIVITY_TIMEOUT_MAX),
#ifdef FEATURE_WLAN_ESE
#endif /* FEATURE_WLAN_ESE */
REG_VARIABLE(CFG_TL_DELAYED_TRGR_FRM_INT_NAME, WLAN_PARAM_Integer,
struct hdd_config, DelayedTriggerFrmInt,
VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
@ -1652,13 +1628,6 @@ bool hdd_update_config_cfg(struct hdd_context *hdd_ctx)
mac_handle = hdd_ctx->mac_handle;
if (sme_cfg_set_int(mac_handle,
WNI_CFG_PS_WOW_DATA_INACTIVITY_TIMEOUT,
config->wow_data_inactivity_timeout) == QDF_STATUS_E_FAILURE) {
status = false;
hdd_err("Fail to pass WNI_CFG_PS_WOW_DATA_INACTIVITY_TO CFG");
}
if (sme_cfg_set_int(mac_handle,
WNI_CFG_REMOVE_TIME_SYNC_CMD,
config->remove_time_stamp_sync_cmd)
@ -1916,7 +1885,6 @@ QDF_STATUS hdd_set_sme_config(struct hdd_context *hdd_ctx)
smeConfig->csrConfig.AdHocChannel24 = ibss_cfg.adhoc_ch_2g;
smeConfig->csrConfig.ProprietaryRatesEnabled = 0;
smeConfig->csrConfig.HeartbeatThresh50 = 40;
smeConfig->csrConfig.nTxPowerCap = pConfig->nTxPowerCap;
smeConfig->csrConfig.fEnableDFSChnlScan = pConfig->enableDFSChnlScan;
smeConfig->csrConfig.Csr11dinfo.Channels.numChannels = 0;

1
core/hdd/src/wlan_hdd_main.c
View file

@ -14270,7 +14270,6 @@ static int hdd_update_pmo_config(struct hdd_context *hdd_ctx)
psoc_cfg.magic_ptrn_enable = (wow_enable & 0x01) ? true : false;
psoc_cfg.ptrn_match_enable_all_vdev =
(wow_enable & 0x02) ? true : false;
psoc_cfg.packet_filter_enabled = !hdd_ctx->config->disablePacketFilter;
psoc_cfg.ap_arpns_support = hdd_ctx->ap_arpns_support;
psoc_cfg.d0_wow_supported = wma_d0_wow_is_supported();
ucfg_mlme_get_sap_max_modulated_dtim(hdd_ctx->psoc,

2
core/mac/inc/ani_global.h
View file

@ -693,8 +693,6 @@ typedef struct sAniSirLim {
uint8_t retry_packet_cnt;
uint8_t beacon_probe_rsp_cnt_per_scan;
wlan_scan_requester req_id;
bool global_obss_offload_enabled;
bool global_obss_color_collision_det_offload;
} tAniSirLim, *tpAniSirLim;
struct mgmt_frm_reg_info {

22
core/mac/inc/wni_cfg.h
View file

@ -25,13 +25,7 @@
enum {
WNI_CFG_VALID_CHANNEL_LIST,
WNI_CFG_APSD_ENABLED,
WNI_CFG_CURRENT_TX_POWER_LEVEL,
WNI_CFG_COUNTRY_CODE,
WNI_CFG_LOCAL_POWER_CONSTRAINT,
WNI_CFG_PS_WOW_DATA_INACTIVITY_TIMEOUT,
WNI_CFG_OBSS_DETECTION_OFFLOAD,
WNI_CFG_OBSS_COLOR_COLLISION_OFFLOAD,
WNI_CFG_REMOVE_TIME_SYNC_CMD,
/* Any new items to be added should be above this strictly */
CFG_PARAM_MAX_NUM
@ -83,23 +77,11 @@ enum {
#define WNI_CFG_CURRENT_CHANNEL_STAMIN 0
#define WNI_CFG_CURRENT_CHANNEL_STAMAX 173
#define WNI_CFG_APSD_ENABLED_STAMIN 0
#define WNI_CFG_APSD_ENABLED_STAMAX 1
#define WNI_CFG_APSD_ENABLED_STADEF 0
#define WNI_CFG_CURRENT_TX_POWER_LEVEL_STAMIN 0
#define WNI_CFG_CURRENT_TX_POWER_LEVEL_STAMAX 128
#define WNI_CFG_CURRENT_TX_POWER_LEVEL_STADEF 27
#define WNI_CFG_EDCA_PROFILE_ANI 0
#define WNI_CFG_EDCA_PROFILE_WMM 1
#define WNI_CFG_EDCA_PROFILE_ETSI_EUROPE 3
#define WNI_CFG_EDCA_PROFILE_MAX 4
#define WNI_CFG_LOCAL_POWER_CONSTRAINT_STAMIN 0
#define WNI_CFG_LOCAL_POWER_CONSTRAINT_STAMAX 255
#define WNI_CFG_LOCAL_POWER_CONSTRAINT_STADEF 0
#define WNI_CFG_ADMIT_POLICY_ADMIT_ALL 0
#define WNI_CFG_ADMIT_POLICY_REJECT_ALL 1
#define WNI_CFG_ADMIT_POLICY_BW_FACTOR 2
@ -138,10 +120,6 @@ enum {
#define WNI_CFG_ASSOC_STA_LIMIT_STAMIN 1
#define WNI_CFG_ASSOC_STA_LIMIT_STAMAX 32
#define WNI_CFG_PS_WOW_DATA_INACTIVITY_TIMEOUT_STAMIN 1
#define WNI_CFG_PS_WOW_DATA_INACTIVITY_TIMEOUT_STAMAX 255
#define WNI_CFG_PS_WOW_DATA_INACTIVITY_TIMEOUT_STADEF 50
#define WNI_CFG_REMOVE_TIME_SYNC_CMD_STAMIN 0
#define WNI_CFG_REMOVE_TIME_SYNC_CMD_STAMAX 1
#define WNI_CFG_REMOVE_TIME_SYNC_CMD_STADEF 0

6
core/mac/src/cfg/cfg_param_name.c
View file

@ -40,13 +40,7 @@ const char *cfg_get_string(uint16_t cfg_id)
default:
break;
CASE_RETURN_STRING(WNI_CFG_VALID_CHANNEL_LIST);
CASE_RETURN_STRING(WNI_CFG_APSD_ENABLED);
CASE_RETURN_STRING(WNI_CFG_CURRENT_TX_POWER_LEVEL);
CASE_RETURN_STRING(WNI_CFG_COUNTRY_CODE);
CASE_RETURN_STRING(WNI_CFG_LOCAL_POWER_CONSTRAINT);
CASE_RETURN_STRING(WNI_CFG_PS_WOW_DATA_INACTIVITY_TIMEOUT);
CASE_RETURN_STRING(WNI_CFG_OBSS_DETECTION_OFFLOAD);
CASE_RETURN_STRING(WNI_CFG_OBSS_COLOR_COLLISION_OFFLOAD);
}
return "invalid";

27
core/mac/src/cfg/cfg_proc_msg.c
View file

@ -30,36 +30,9 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_RESTART |
CFG_CTL_NTF_LIM,
0, 1, 1},
{WNI_CFG_APSD_ENABLED,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_APSD_ENABLED_STAMIN,
WNI_CFG_APSD_ENABLED_STAMAX,
WNI_CFG_APSD_ENABLED_STADEF},
{WNI_CFG_CURRENT_TX_POWER_LEVEL,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_CURRENT_TX_POWER_LEVEL_STAMIN,
WNI_CFG_CURRENT_TX_POWER_LEVEL_STAMAX,
WNI_CFG_CURRENT_TX_POWER_LEVEL_STADEF},
{WNI_CFG_COUNTRY_CODE,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_NTF_SCH,
0, 0, 0},
{WNI_CFG_LOCAL_POWER_CONSTRAINT,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
CFG_CTL_RESTART,
WNI_CFG_LOCAL_POWER_CONSTRAINT_STAMIN,
WNI_CFG_LOCAL_POWER_CONSTRAINT_STAMAX,
WNI_CFG_LOCAL_POWER_CONSTRAINT_STADEF},
{WNI_CFG_PS_WOW_DATA_INACTIVITY_TIMEOUT,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_PS_WOW_DATA_INACTIVITY_TIMEOUT_STAMIN,
WNI_CFG_PS_WOW_DATA_INACTIVITY_TIMEOUT_STAMAX,
WNI_CFG_PS_WOW_DATA_INACTIVITY_TIMEOUT_STADEF},
{WNI_CFG_OBSS_DETECTION_OFFLOAD,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
0, 1, 0},
{WNI_CFG_OBSS_COLOR_COLLISION_OFFLOAD,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
0, 1, 0},
{WNI_CFG_REMOVE_TIME_SYNC_CMD,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_REMOVE_TIME_SYNC_CMD_STAMIN,

6
core/sme/inc/csr_api.h
View file

@ -997,12 +997,6 @@ typedef struct tagCsrConfigParam {
*/
uint8_t fAllowMCCGODiffBI;
tCsr11dinfo Csr11dinfo;
/*
* in dBm, the maximum TX power The actual TX power is the lesser of
* this value and 11d. If 11d is disable, the lesser of this and
* default setting.
*/
uint8_t nTxPowerCap;
/* stats request frequency from PE while in full power */
uint32_t statsReqPeriodicity;
/* stats request frequency from PE while in power save */

5
core/sme/inc/csr_internal.h
View file

@ -386,11 +386,6 @@ struct csr_config {
uint32_t BssPreferValue[CSR_NUM_RSSI_CAT];
int RSSICat[CSR_NUM_RSSI_CAT];
uint8_t bCatRssiOffset; /* to set RSSI difference for each category */
/*
* in dBm, the max TX power. The actual TX power is the lesser of this
* value & 11d. If 11d is disable, the lesser of this & default setting.
*/
uint8_t nTxPowerCap;
uint32_t statsReqPeriodicity; /* stats req freq while in fullpower */
uint32_t statsReqPeriodicityInPS;/* stats req freq while in powersave */
uint32_t dtimPeriod;