samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Remove not used WNI CFG

Browse Source 
Cleanup not used WNI configures. This is part of FR about WNI and INI
CFG.

Change-Id: Iee92add09366188ccb5a6f2385d07758221f8d67
CRs-Fixed: 2206059
This commit is contained in:
Wu Gao
2018-02-09 12:29:27 +08:00
committed by nshrivas
parent 233dfacd74
commit 8800cb17f1
8 changed files with 2 additions and 566 deletions
Download Patch File Download Diff File Expand all files Collapse all files

128
core/hdd/src/wlan_hdd_cfg.c
View File

@@ -8210,39 +8210,6 @@ bool hdd_update_config_cfg(struct hdd_context *hdd_ctx)
hdd_err("Couldn't pass on WNI_CFG_LOW_GAIN_OVERRIDE to HAL");
}
if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_RSSI_FILTER_PERIOD,
config->nRssiFilterPeriod) == QDF_STATUS_E_FAILURE) {
status = false;
hdd_err("Couldn't pass on WNI_CFG_RSSI_FILTER_PERIOD to CFG");
}
if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_IGNORE_DTIM,
config->fIgnoreDtim) == QDF_STATUS_E_FAILURE) {
status = false;
hdd_err("Couldn't pass on WNI_IGNORE_DTIM to CFG");
}
if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_PS_ENABLE_HEART_BEAT,
config->fEnableFwHeartBeatMonitoring)
== QDF_STATUS_E_FAILURE) {
status = false;
hdd_err("Couldn't pass on WNI_CFG_PS_HEART_BEAT to CFG");
}
if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_PS_ENABLE_BCN_FILTER,
config->fEnableFwBeaconFiltering) ==
QDF_STATUS_E_FAILURE) {
status = false;
hdd_err("Couldn't pass on WNI_CFG_PS_BCN_FILTER to CFG");
}
if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_PS_ENABLE_RSSI_MONITOR,
config->fEnableFwRssiMonitoring) ==
QDF_STATUS_E_FAILURE) {
status = false;
hdd_err("Couldn't pass on WNI_CFG_PS_RSSI_MONITOR to CFG");
}
if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT,
config->nDataInactivityTimeout) == QDF_STATUS_E_FAILURE) {
status = false;
@@ -8298,13 +8265,6 @@ bool hdd_update_config_cfg(struct hdd_context *hdd_ctx)
hdd_err("Couldn't pass on WNI_CFG_TELE_BCN_WAKEUP_EN to CFG");
}
if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_TELE_BCN_TRANS_LI,
config->nTeleBcnTransListenInterval) ==
QDF_STATUS_E_FAILURE) {
status = false;
hdd_err("Couldn't pass on WNI_CFG_TELE_BCN_TRANS_LI to CFG");
}
if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_TELE_BCN_MAX_LI,
config->nTeleBcnMaxListenInterval) ==
QDF_STATUS_E_FAILURE) {
@@ -8312,50 +8272,13 @@ bool hdd_update_config_cfg(struct hdd_context *hdd_ctx)
hdd_err("Couldn't pass on WNI_CFG_TELE_BCN_MAX_LI to CFG");
}
if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS,
config->nTeleBcnTransLiNumIdleBeacons) ==
QDF_STATUS_E_FAILURE) {
status = false;
hdd_err("Couldn't pass on WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS to CFG");
}
if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS,
config->nTeleBcnMaxLiNumIdleBeacons) ==
QDF_STATUS_E_FAILURE) {
status = false;
hdd_err("Couldn't pass on WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS to CFG");
}
if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_RF_SETTLING_TIME_CLK,
config->rfSettlingTimeUs) == QDF_STATUS_E_FAILURE) {
status = false;
hdd_err("Couldn't pass on WNI_CFG_RF_SETTLING_TIME_CLK to CFG");
}
if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD,
config->infraStaKeepAlivePeriod) ==
QDF_STATUS_E_FAILURE) {
status = false;
hdd_err("Couldn't pass on WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD to CFG");
}
if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_DYNAMIC_PS_POLL_VALUE,
config->dynamicPsPollValue) == QDF_STATUS_E_FAILURE) {
status = false;
hdd_err("Couldn't pass on WNI_CFG_DYNAMIC_PS_POLL_VALUE to CFG");
}
if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT,
config->nNullDataApRespTimeout) == QDF_STATUS_E_FAILURE) {
status = false;
hdd_err("Couldn't pass on WNI_CFG_PS_NULLDATA_DELAY_TIMEOUT to CFG");
}
if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD,
config->apDataAvailPollPeriodInMs) ==
QDF_STATUS_E_FAILURE) {
status = false;
hdd_err("Couldn't pass on WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD to CFG");
}
if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_FRAGMENTATION_THRESHOLD,
config->FragmentationThreshold) == QDF_STATUS_E_FAILURE) {
status = false;
@@ -8407,12 +8330,6 @@ bool hdd_update_config_cfg(struct hdd_context *hdd_ctx)
hdd_err("Couldn't pass on WNI_CFG_ASSOC_STA_LIMIT to CFG");
}
#endif
if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_ENABLE_LPWR_IMG_TRANSITION,
config->enableLpwrImgTransition)
== QDF_STATUS_E_FAILURE) {
status = false;
hdd_err("Couldn't pass on WNI_CFG_ENABLE_LPWR_IMG_TRANSITION to CFG");
}
if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED,
config->enableMCCAdaptiveScheduler) ==
@@ -8426,29 +8343,6 @@ bool hdd_update_config_cfg(struct hdd_context *hdd_ctx)
hdd_err("Couldn't pass on WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP to CFG");
}
if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_DYNAMIC_THRESHOLD_ZERO,
config->retryLimitZero) == QDF_STATUS_E_FAILURE) {
status = false;
hdd_err("Couldn't pass on WNI_CFG_DYNAMIC_THRESHOLD_ZERO to CFG");
}
if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_DYNAMIC_THRESHOLD_ONE,
config->retryLimitOne) == QDF_STATUS_E_FAILURE) {
status = false;
hdd_err("Couldn't pass on WNI_CFG_DYNAMIC_THRESHOLD_ONE to CFG");
}
if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_DYNAMIC_THRESHOLD_TWO,
config->retryLimitTwo) == QDF_STATUS_E_FAILURE) {
status = false;
hdd_err("Couldn't pass on WNI_CFG_DYNAMIC_THRESHOLD_TWO to CFG");
}
if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_MAX_MEDIUM_TIME,
config->cfgMaxMediumTime) == QDF_STATUS_E_FAILURE) {
status = false;
hdd_err("Couldn't pass on WNI_CFG_MAX_MEDIUM_TIME to CFG");
}
#ifdef FEATURE_WLAN_TDLS
if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_TDLS_QOS_WMM_UAPSD_MASK,
@@ -8489,28 +8383,6 @@ bool hdd_update_config_cfg(struct hdd_context *hdd_ctx)
}
#endif
if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_ENABLE_ADAPT_RX_DRAIN,
config->fEnableAdaptRxDrain) ==
QDF_STATUS_E_FAILURE) {
status = false;
hdd_err("Couldn't pass on WNI_CFG_ENABLE_ADAPT_RX_DRAIN to CFG");
}
if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_ANTENNA_DIVESITY,
config->antennaDiversity) ==
QDF_STATUS_E_FAILURE) {
status = false;
hdd_err("Couldn't pass on WNI_CFG_ANTENNA_DIVESITY to CFG");
}
if (sme_cfg_set_int(hdd_ctx->hHal,
WNI_CFG_DEFAULT_RATE_INDEX_24GHZ,
config->defaultRateIndex24Ghz) ==
QDF_STATUS_E_FAILURE) {
status = false;
hdd_err("Couldn't pass on WNI_CFG_DEFAULT_RATE_INDEX_24GHZ to CFG");
}
if (sme_cfg_set_int(hdd_ctx->hHal,
WNI_CFG_DEBUG_P2P_REMAIN_ON_CHANNEL,
config->debugP2pRemainOnChannel) ==

31
core/hdd/src/wlan_hdd_cfg80211.c
View File

@@ -20349,37 +20349,6 @@ static int __wlan_hdd_cfg80211_set_wiphy_params(struct wiphy *wiphy,
hdd_debug("set frag threshold %hu", frag_threshold);
}
if ((changed & WIPHY_PARAM_RETRY_SHORT)
|| (changed & WIPHY_PARAM_RETRY_LONG)) {
u8 retry_value = (changed & WIPHY_PARAM_RETRY_SHORT) ?
wiphy->retry_short : wiphy->retry_long;
if ((WNI_CFG_LONG_RETRY_LIMIT_STAMIN > retry_value) ||
(WNI_CFG_LONG_RETRY_LIMIT_STAMAX < retry_value)) {
hdd_err("Invalid Retry count: %hu", retry_value);
return -EINVAL;
}
if (changed & WIPHY_PARAM_RETRY_LONG) {
if (0 != sme_cfg_set_int(hHal,
WNI_CFG_LONG_RETRY_LIMIT,
retry_value)) {
hdd_err("sme_cfg_set_int failed for long retry count: %hu",
retry_value);
return -EIO;
}
hdd_debug("set long retry count %hu", retry_value);
} else if (changed & WIPHY_PARAM_RETRY_SHORT) {
if (0 != sme_cfg_set_int(hHal,
WNI_CFG_SHORT_RETRY_LIMIT,
retry_value)) {
hdd_err("sme_cfg_set_int failed for short retry count: %hu",
retry_value);
return -EIO;
}
hdd_debug("set short retry count %hu", retry_value);
}
}
hdd_exit();
return 0;
}

114
core/mac/inc/wni_cfg.h
View File

@@ -39,16 +39,12 @@ enum {
WNI_CFG_SSID,
WNI_CFG_BEACON_INTERVAL,
WNI_CFG_DTIM_PERIOD,
WNI_CFG_WEP_KEY_LENGTH,
WNI_CFG_WEP_DEFAULT_KEY_1,
WNI_CFG_WEP_DEFAULT_KEY_2,
WNI_CFG_WEP_DEFAULT_KEY_3,
WNI_CFG_WEP_DEFAULT_KEY_4,
WNI_CFG_WEP_DEFAULT_KEYID,
WNI_CFG_EXCLUDE_UNENCRYPTED,
WNI_CFG_RTS_THRESHOLD,
WNI_CFG_SHORT_RETRY_LIMIT,
WNI_CFG_LONG_RETRY_LIMIT,
WNI_CFG_FRAGMENTATION_THRESHOLD,
WNI_CFG_ACTIVE_MINIMUM_CHANNEL_TIME,
WNI_CFG_ACTIVE_MAXIMUM_CHANNEL_TIME,
@@ -59,22 +55,14 @@ enum {
WNI_CFG_AUTHENTICATE_RSP_TIMEOUT,
WNI_CFG_ASSOCIATION_FAILURE_TIMEOUT,
WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT,
WNI_CFG_PS_ENABLE_BCN_FILTER,
WNI_CFG_PS_ENABLE_HEART_BEAT,
WNI_CFG_PS_ENABLE_RSSI_MONITOR,
WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT,
WNI_CFG_RF_SETTLING_TIME_CLK,
WNI_CFG_SUPPORTED_RATES_11B,
WNI_CFG_SUPPORTED_RATES_11A,
WNI_CFG_PHY_MODE,
WNI_CFG_DOT11_MODE,
WNI_CFG_OPERATIONAL_RATE_SET,
WNI_CFG_EXTENDED_OPERATIONAL_RATE_SET,
WNI_CFG_PROPRIETARY_OPERATIONAL_RATE_SET,
WNI_CFG_LISTEN_INTERVAL,
WNI_CFG_VALID_CHANNEL_LIST,
WNI_CFG_CURRENT_CHANNEL,
WNI_CFG_DEFAULT_RATE_INDEX_24GHZ,
WNI_CFG_APSD_ENABLED,
WNI_CFG_SHARED_KEY_AUTH_ENABLE,
WNI_CFG_OPEN_SYSTEM_AUTH_ENABLE,
@@ -133,9 +121,6 @@ enum {
WNI_CFG_ADMIT_POLICY,
WNI_CFG_ADMIT_BWFACTOR,
WNI_CFG_CHANNEL_BONDING_MODE,
WNI_CFG_DYNAMIC_THRESHOLD_ZERO,
WNI_CFG_DYNAMIC_THRESHOLD_ONE,
WNI_CFG_DYNAMIC_THRESHOLD_TWO,
WNI_CFG_SCAN_CONTROL_LIST,
WNI_CFG_BLOCK_ACK_ENABLED,
WNI_CFG_HT_CAP_INFO,
@@ -181,18 +166,14 @@ enum {
WNI_CFG_MPDU_DENSITY,
WNI_CFG_MAX_RX_AMPDU_FACTOR,
WNI_CFG_MAX_PS_POLL,
WNI_CFG_RSSI_FILTER_PERIOD,
WNI_CFG_SCAN_IN_POWERSAVE,
WNI_CFG_IGNORE_DTIM,
WNI_CFG_WOWLAN_UCAST_PATTERN_FILTER_ENABLE,
WNI_CFG_WOWLAN_CHANNEL_SWITCH_ENABLE,
WNI_CFG_WOWLAN_DEAUTH_ENABLE,
WNI_CFG_WOWLAN_DISASSOC_ENABLE,
WNI_CFG_WOWLAN_MAX_MISSED_BEACON,
WNI_CFG_WOWLAN_MAX_SLEEP_PERIOD,
WNI_CFG_MAX_MEDIUM_TIME,
WNI_CFG_IBSS_AUTO_BSSID,
WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG,
WNI_CFG_WPS_ENABLE,
WNI_CFG_WPS_STATE,
WNI_CFG_WPS_VERSION,
@@ -202,23 +183,15 @@ enum {
WNI_CFG_WPS_PIMARY_DEVICE_OUI,
WNI_CFG_WPS_DEVICE_SUB_CATEGORY,
WNI_CFG_WPS_DEVICE_PASSWORD_ID,
WNI_CFG_LOW_GAIN_OVERRIDE,
WNI_CFG_SINGLE_TID_RC,
WNI_CFG_DYNAMIC_PS_POLL_VALUE,
WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT,
WNI_CFG_TELE_BCN_WAKEUP_EN,
WNI_CFG_TELE_BCN_TRANS_LI,
WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS,
WNI_CFG_TELE_BCN_MAX_LI,
WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS,
WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD,
WNI_CFG_ASSOC_STA_LIMIT,
WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD,
WNI_CFG_ENABLE_LTE_COEX,
WNI_CFG_AP_KEEP_ALIVE_TIMEOUT,
WNI_CFG_GO_KEEP_ALIVE_TIMEOUT,
WNI_CFG_ENABLE_MC_ADDR_LIST,
WNI_CFG_ENABLE_LPWR_IMG_TRANSITION,
WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED,
WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP,
WNI_CFG_AP_LINK_MONITOR_TIMEOUT,
@@ -228,8 +201,6 @@ enum {
WNI_CFG_TDLS_RX_FRAME_THRESHOLD,
WNI_CFG_PMF_SA_QUERY_MAX_RETRIES,
WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL,
WNI_CFG_ENABLE_ADAPT_RX_DRAIN,
WNI_CFG_ANTENNA_DIVESITY,
WNI_CFG_GO_LINK_MONITOR_TIMEOUT,
WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY,
WNI_CFG_CURRENT_RSSI,
@@ -437,10 +408,6 @@ enum {
#define WNI_CFG_DTIM_PERIOD_STAMAX 65535
#define WNI_CFG_DTIM_PERIOD_STADEF 1
#define WNI_CFG_WEP_KEY_LENGTH_STAMIN 5
#define WNI_CFG_WEP_KEY_LENGTH_STAMAX 13
#define WNI_CFG_WEP_KEY_LENGTH_STADEF 5
#define WNI_CFG_WEP_KEY_LENGTH_5 5
#define WNI_CFG_WEP_KEY_LENGTH_13 13
@@ -461,14 +428,6 @@ enum {
#define WNI_CFG_RTS_THRESHOLD_STAMAX 1048576
#define WNI_CFG_RTS_THRESHOLD_STADEF 2347
#define WNI_CFG_SHORT_RETRY_LIMIT_STAMIN 0
#define WNI_CFG_SHORT_RETRY_LIMIT_STAMAX 255
#define WNI_CFG_SHORT_RETRY_LIMIT_STADEF 6
#define WNI_CFG_LONG_RETRY_LIMIT_STAMIN 0
#define WNI_CFG_LONG_RETRY_LIMIT_STAMAX 255
#define WNI_CFG_LONG_RETRY_LIMIT_STADEF 6
#define WNI_CFG_FRAGMENTATION_THRESHOLD_STAMIN 256
#define WNI_CFG_FRAGMENTATION_THRESHOLD_STAMAX 8000
#define WNI_CFG_FRAGMENTATION_THRESHOLD_STADEF 8000
@@ -562,10 +521,6 @@ enum {
#define WNI_CFG_CURRENT_CHANNEL_STAMAX 165
#define WNI_CFG_CURRENT_CHANNEL_STADEF 1
#define WNI_CFG_DEFAULT_RATE_INDEX_24GHZ_STAMIN 0
#define WNI_CFG_DEFAULT_RATE_INDEX_24GHZ_STAMAX 31
#define WNI_CFG_DEFAULT_RATE_INDEX_24GHZ_STADEF 1
#define WNI_CFG_RATE_ADAPTATION_TYPE_FIXED 0
#define WNI_CFG_RATE_ADAPTATION_TYPE_AUTO 1
#define WNI_CFG_RATE_ADAPTATION_TYPE_SNR_BASED 2
@@ -709,7 +664,6 @@ enum {
#define WNI_CFG_NEW_BSS_FOUND_IND_STAMAX 1
#define WNI_CFG_NEW_BSS_FOUND_IND_STADEF 0
#define WNI_CFG_11H_ENABLED_STAMIN 0
#define WNI_CFG_11H_ENABLED_STAMAX 1
#define WNI_CFG_11H_ENABLED_STADEF 1
@@ -833,18 +787,6 @@ enum {
#define WNI_CFG_CHANNEL_BONDING_MODE_IF_NO_LEGACY_ALL 3
#define WNI_CFG_CHANNEL_BONDING_MODE_INTELLIGENT 4
#define WNI_CFG_DYNAMIC_THRESHOLD_ZERO_STAMIN 0
#define WNI_CFG_DYNAMIC_THRESHOLD_ZERO_STAMAX 255
#define WNI_CFG_DYNAMIC_THRESHOLD_ZERO_STADEF 2
#define WNI_CFG_DYNAMIC_THRESHOLD_ONE_STAMIN 0
#define WNI_CFG_DYNAMIC_THRESHOLD_ONE_STAMAX 255
#define WNI_CFG_DYNAMIC_THRESHOLD_ONE_STADEF 4
#define WNI_CFG_DYNAMIC_THRESHOLD_TWO_STAMIN 0
#define WNI_CFG_DYNAMIC_THRESHOLD_TWO_STAMAX 255
#define WNI_CFG_DYNAMIC_THRESHOLD_TWO_STADEF 6
#define WNI_CFG_BLOCK_ACK_ENABLED_STAMIN 0
#define WNI_CFG_BLOCK_ACK_ENABLED_STAMAX 3
#define WNI_CFG_BLOCK_ACK_ENABLED_STADEF 0
@@ -1111,18 +1053,10 @@ enum {
#define WNI_CFG_MAX_PS_POLL_STAMAX 255
#define WNI_CFG_MAX_PS_POLL_STADEF 0
#define WNI_CFG_RSSI_FILTER_PERIOD_STAMIN 0
#define WNI_CFG_RSSI_FILTER_PERIOD_STAMAX 255
#define WNI_CFG_RSSI_FILTER_PERIOD_STADEF 5
#define WNI_CFG_SCAN_IN_POWERSAVE_STAMIN 0
#define WNI_CFG_SCAN_IN_POWERSAVE_STAMAX 1
#define WNI_CFG_SCAN_IN_POWERSAVE_STADEF 1
#define WNI_CFG_IGNORE_DTIM_STAMIN 0
#define WNI_CFG_IGNORE_DTIM_STAMAX 1
#define WNI_CFG_IGNORE_DTIM_STADEF 0
#define WNI_CFG_WOWLAN_UCAST_PATTERN_FILTER_ENABLE_STAMIN 0
#define WNI_CFG_WOWLAN_UCAST_PATTERN_FILTER_ENABLE_STAMAX 1
#define WNI_CFG_WOWLAN_UCAST_PATTERN_FILTER_ENABLE_STADEF 1
@@ -1147,18 +1081,10 @@ enum {
#define WNI_CFG_WOWLAN_MAX_SLEEP_PERIOD_STAMAX 65535
#define WNI_CFG_WOWLAN_MAX_SLEEP_PERIOD_STADEF 65535
#define WNI_CFG_MAX_MEDIUM_TIME_STAMIN 0
#define WNI_CFG_MAX_MEDIUM_TIME_STAMAX 65535
#define WNI_CFG_MAX_MEDIUM_TIME_STADEF 2048
#define WNI_CFG_IBSS_AUTO_BSSID_STAMIN 0
#define WNI_CFG_IBSS_AUTO_BSSID_STAMAX 1
#define WNI_CFG_IBSS_AUTO_BSSID_STADEF 1
#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG_STAMIN 0
#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG_STAMAX 1
#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG_STADEF 0
#define WNI_CFG_WPS_ENABLE_STAMIN 0
#define WNI_CFG_WPS_ENABLE_STAMAX 255
#define WNI_CFG_WPS_ENABLE_STADEF 0
@@ -1194,42 +1120,18 @@ enum {
#define WNI_CFG_WPS_DEVICE_PASSWORD_ID_STAMAX 4294967295
#define WNI_CFG_WPS_DEVICE_PASSWORD_ID_STADEF 0
#define WNI_CFG_LOW_GAIN_OVERRIDE_STAMIN 0
#define WNI_CFG_LOW_GAIN_OVERRIDE_STAMAX 1
#define WNI_CFG_LOW_GAIN_OVERRIDE_STADEF 0
#define WNI_CFG_SINGLE_TID_RC_STAMIN 0
#define WNI_CFG_SINGLE_TID_RC_STAMAX 1
#define WNI_CFG_SINGLE_TID_RC_STADEF 1
#define WNI_CFG_DYNAMIC_PS_POLL_VALUE_STAMIN 0
#define WNI_CFG_DYNAMIC_PS_POLL_VALUE_STAMAX 255
#define WNI_CFG_DYNAMIC_PS_POLL_VALUE_STADEF 0
#define WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT_STAMIN 0
#define WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT_STAMAX 80
#define WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT_STADEF 0
#define WNI_CFG_TELE_BCN_WAKEUP_EN_STAMIN 0
#define WNI_CFG_TELE_BCN_WAKEUP_EN_STAMAX 1
#define WNI_CFG_TELE_BCN_WAKEUP_EN_STADEF 0
#define WNI_CFG_TELE_BCN_TRANS_LI_STAMIN 0
#define WNI_CFG_TELE_BCN_TRANS_LI_STAMAX 7
#define WNI_CFG_TELE_BCN_TRANS_LI_STADEF 3
#define WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS_STAMIN 5
#define WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS_STAMAX 255
#define WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS_STADEF 10
#define WNI_CFG_TELE_BCN_MAX_LI_STAMIN 0
#define WNI_CFG_TELE_BCN_MAX_LI_STAMAX 7
#define WNI_CFG_TELE_BCN_MAX_LI_STADEF 5
#define WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS_STAMIN 5
#define WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS_STAMAX 255
#define WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS_STADEF 15
#define WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD_STAMIN 0
#define WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD_STAMAX 1000
#define WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD_STADEF 0
@@ -1238,10 +1140,6 @@ enum {
#define WNI_CFG_ASSOC_STA_LIMIT_STAMAX 32
#define WNI_CFG_ASSOC_STA_LIMIT_STADEF 10
#define WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD_STAMIN 0
#define WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD_STAMAX 65535
#define WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD_STADEF 5
#define WNI_CFG_ENABLE_LTE_COEX_STAMIN 0
#define WNI_CFG_ENABLE_LTE_COEX_STAMAX 1
#define WNI_CFG_ENABLE_LTE_COEX_STADEF 0
@@ -1258,10 +1156,6 @@ enum {
#define WNI_CFG_ENABLE_MC_ADDR_LIST_STAMAX 1
#define WNI_CFG_ENABLE_MC_ADDR_LIST_STADEF 0
#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION_STAMIN 0
#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION_STAMAX 1
#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION_STADEF 0
#define WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED_STAMIN 0
#define WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED_STAMAX 1
#define WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED_STADEF 0
@@ -1298,14 +1192,6 @@ enum {
#define WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL_STAMAX 2000
#define WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL_STADEF 200
#define WNI_CFG_ENABLE_ADAPT_RX_DRAIN_STAMIN 0
#define WNI_CFG_ENABLE_ADAPT_RX_DRAIN_STAMAX 1
#define WNI_CFG_ENABLE_ADAPT_RX_DRAIN_STADEF 1
#define WNI_CFG_ANTENNA_DIVESITY_STAMIN 0
#define WNI_CFG_ANTENNA_DIVESITY_STAMAX 3
#define WNI_CFG_ANTENNA_DIVESITY_STADEF 0
#define WNI_CFG_GO_LINK_MONITOR_TIMEOUT_STAMIN 3
#define WNI_CFG_GO_LINK_MONITOR_TIMEOUT_STAMAX 50
#define WNI_CFG_GO_LINK_MONITOR_TIMEOUT_STADEF 10

30
core/mac/src/cfg/cfg_param_name.c
View File

@@ -48,16 +48,12 @@ const char *cfg_get_string(uint16_t cfg_id)
CASE_RETURN_STRING(WNI_CFG_SSID);
CASE_RETURN_STRING(WNI_CFG_BEACON_INTERVAL);
CASE_RETURN_STRING(WNI_CFG_DTIM_PERIOD);
CASE_RETURN_STRING(WNI_CFG_WEP_KEY_LENGTH);
CASE_RETURN_STRING(WNI_CFG_WEP_DEFAULT_KEY_1);
CASE_RETURN_STRING(WNI_CFG_WEP_DEFAULT_KEY_2);
CASE_RETURN_STRING(WNI_CFG_WEP_DEFAULT_KEY_3);
CASE_RETURN_STRING(WNI_CFG_WEP_DEFAULT_KEY_4);
CASE_RETURN_STRING(WNI_CFG_WEP_DEFAULT_KEYID);
CASE_RETURN_STRING(WNI_CFG_EXCLUDE_UNENCRYPTED);
CASE_RETURN_STRING(WNI_CFG_RTS_THRESHOLD);
CASE_RETURN_STRING(WNI_CFG_SHORT_RETRY_LIMIT);
CASE_RETURN_STRING(WNI_CFG_LONG_RETRY_LIMIT);
CASE_RETURN_STRING(WNI_CFG_FRAGMENTATION_THRESHOLD);
CASE_RETURN_STRING(WNI_CFG_ACTIVE_MINIMUM_CHANNEL_TIME);
CASE_RETURN_STRING(WNI_CFG_ACTIVE_MAXIMUM_CHANNEL_TIME);
@@ -68,22 +64,14 @@ const char *cfg_get_string(uint16_t cfg_id)
CASE_RETURN_STRING(WNI_CFG_AUTHENTICATE_RSP_TIMEOUT);
CASE_RETURN_STRING(WNI_CFG_ASSOCIATION_FAILURE_TIMEOUT);
CASE_RETURN_STRING(WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT);
CASE_RETURN_STRING(WNI_CFG_PS_ENABLE_BCN_FILTER);
CASE_RETURN_STRING(WNI_CFG_PS_ENABLE_HEART_BEAT);
CASE_RETURN_STRING(WNI_CFG_PS_ENABLE_RSSI_MONITOR);
CASE_RETURN_STRING(WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT);
CASE_RETURN_STRING(WNI_CFG_RF_SETTLING_TIME_CLK);
CASE_RETURN_STRING(WNI_CFG_SUPPORTED_RATES_11B);
CASE_RETURN_STRING(WNI_CFG_SUPPORTED_RATES_11A);
CASE_RETURN_STRING(WNI_CFG_PHY_MODE);
CASE_RETURN_STRING(WNI_CFG_DOT11_MODE);
CASE_RETURN_STRING(WNI_CFG_OPERATIONAL_RATE_SET);
CASE_RETURN_STRING(WNI_CFG_EXTENDED_OPERATIONAL_RATE_SET);
CASE_RETURN_STRING(WNI_CFG_PROPRIETARY_OPERATIONAL_RATE_SET);
CASE_RETURN_STRING(WNI_CFG_LISTEN_INTERVAL);
CASE_RETURN_STRING(WNI_CFG_VALID_CHANNEL_LIST);
CASE_RETURN_STRING(WNI_CFG_CURRENT_CHANNEL);
CASE_RETURN_STRING(WNI_CFG_DEFAULT_RATE_INDEX_24GHZ);
CASE_RETURN_STRING(WNI_CFG_APSD_ENABLED);
CASE_RETURN_STRING(WNI_CFG_SHARED_KEY_AUTH_ENABLE);
CASE_RETURN_STRING(WNI_CFG_OPEN_SYSTEM_AUTH_ENABLE);
@@ -142,9 +130,6 @@ const char *cfg_get_string(uint16_t cfg_id)
CASE_RETURN_STRING(WNI_CFG_ADMIT_POLICY);
CASE_RETURN_STRING(WNI_CFG_ADMIT_BWFACTOR);
CASE_RETURN_STRING(WNI_CFG_CHANNEL_BONDING_MODE);
CASE_RETURN_STRING(WNI_CFG_DYNAMIC_THRESHOLD_ZERO);
CASE_RETURN_STRING(WNI_CFG_DYNAMIC_THRESHOLD_ONE);
CASE_RETURN_STRING(WNI_CFG_DYNAMIC_THRESHOLD_TWO);
CASE_RETURN_STRING(WNI_CFG_SCAN_CONTROL_LIST);
CASE_RETURN_STRING(WNI_CFG_BLOCK_ACK_ENABLED);
CASE_RETURN_STRING(WNI_CFG_HT_CAP_INFO);
@@ -190,18 +175,13 @@ const char *cfg_get_string(uint16_t cfg_id)
CASE_RETURN_STRING(WNI_CFG_MPDU_DENSITY);
CASE_RETURN_STRING(WNI_CFG_MAX_RX_AMPDU_FACTOR);
CASE_RETURN_STRING(WNI_CFG_MAX_PS_POLL);
CASE_RETURN_STRING(WNI_CFG_RSSI_FILTER_PERIOD);
CASE_RETURN_STRING(WNI_CFG_SCAN_IN_POWERSAVE);
CASE_RETURN_STRING(WNI_CFG_IGNORE_DTIM);
CASE_RETURN_STRING(WNI_CFG_WOWLAN_UCAST_PATTERN_FILTER_ENABLE);
CASE_RETURN_STRING(WNI_CFG_WOWLAN_CHANNEL_SWITCH_ENABLE);
CASE_RETURN_STRING(WNI_CFG_WOWLAN_DEAUTH_ENABLE);
CASE_RETURN_STRING(WNI_CFG_WOWLAN_DISASSOC_ENABLE);
CASE_RETURN_STRING(WNI_CFG_WOWLAN_MAX_MISSED_BEACON);
CASE_RETURN_STRING(WNI_CFG_WOWLAN_MAX_SLEEP_PERIOD);
CASE_RETURN_STRING(WNI_CFG_MAX_MEDIUM_TIME);
CASE_RETURN_STRING(WNI_CFG_IBSS_AUTO_BSSID);
CASE_RETURN_STRING(WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG);
CASE_RETURN_STRING(WNI_CFG_WPS_ENABLE);
CASE_RETURN_STRING(WNI_CFG_WPS_STATE);
CASE_RETURN_STRING(WNI_CFG_WPS_VERSION);
@@ -211,23 +191,15 @@ const char *cfg_get_string(uint16_t cfg_id)
CASE_RETURN_STRING(WNI_CFG_WPS_PIMARY_DEVICE_OUI);
CASE_RETURN_STRING(WNI_CFG_WPS_DEVICE_SUB_CATEGORY);
CASE_RETURN_STRING(WNI_CFG_WPS_DEVICE_PASSWORD_ID);
CASE_RETURN_STRING(WNI_CFG_LOW_GAIN_OVERRIDE);
CASE_RETURN_STRING(WNI_CFG_SINGLE_TID_RC);
CASE_RETURN_STRING(WNI_CFG_DYNAMIC_PS_POLL_VALUE);
CASE_RETURN_STRING(WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT);
CASE_RETURN_STRING(WNI_CFG_TELE_BCN_WAKEUP_EN);
CASE_RETURN_STRING(WNI_CFG_TELE_BCN_TRANS_LI);
CASE_RETURN_STRING(WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS);
CASE_RETURN_STRING(WNI_CFG_TELE_BCN_MAX_LI);
CASE_RETURN_STRING(WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS);
CASE_RETURN_STRING(WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD);
CASE_RETURN_STRING(WNI_CFG_ASSOC_STA_LIMIT);
CASE_RETURN_STRING(WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD);
CASE_RETURN_STRING(WNI_CFG_ENABLE_LTE_COEX);
CASE_RETURN_STRING(WNI_CFG_AP_KEEP_ALIVE_TIMEOUT);
CASE_RETURN_STRING(WNI_CFG_GO_KEEP_ALIVE_TIMEOUT);
CASE_RETURN_STRING(WNI_CFG_ENABLE_MC_ADDR_LIST);
CASE_RETURN_STRING(WNI_CFG_ENABLE_LPWR_IMG_TRANSITION);
CASE_RETURN_STRING(WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED);
CASE_RETURN_STRING(WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP);
CASE_RETURN_STRING(WNI_CFG_AP_LINK_MONITOR_TIMEOUT);
@@ -237,8 +209,6 @@ const char *cfg_get_string(uint16_t cfg_id)
CASE_RETURN_STRING(WNI_CFG_TDLS_RX_FRAME_THRESHOLD);
CASE_RETURN_STRING(WNI_CFG_PMF_SA_QUERY_MAX_RETRIES);
CASE_RETURN_STRING(WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL);
CASE_RETURN_STRING(WNI_CFG_ENABLE_ADAPT_RX_DRAIN);
CASE_RETURN_STRING(WNI_CFG_ANTENNA_DIVESITY);
CASE_RETURN_STRING(WNI_CFG_GO_LINK_MONITOR_TIMEOUT);
CASE_RETURN_STRING(WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY);
CASE_RETURN_STRING(WNI_CFG_CURRENT_RSSI);

152
core/mac/src/cfg/cfg_proc_msg.c
View File

@@ -62,12 +62,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
WNI_CFG_DTIM_PERIOD_STAMIN,
WNI_CFG_DTIM_PERIOD_STAMAX,
WNI_CFG_DTIM_PERIOD_STADEF},
{WNI_CFG_WEP_KEY_LENGTH,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
CFG_CTL_RESTART,
WNI_CFG_WEP_KEY_LENGTH_STAMIN,
WNI_CFG_WEP_KEY_LENGTH_STAMAX,
WNI_CFG_WEP_KEY_LENGTH_STADEF},
{WNI_CFG_WEP_DEFAULT_KEY_1,
CFG_CTL_VALID | CFG_CTL_WE | CFG_CTL_RESTART,
0, 65535, 0},
@@ -86,28 +80,12 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
WNI_CFG_WEP_DEFAULT_KEYID_STAMIN,
WNI_CFG_WEP_DEFAULT_KEYID_STAMAX,
WNI_CFG_WEP_DEFAULT_KEYID_STADEF},
{WNI_CFG_EXCLUDE_UNENCRYPTED,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
CFG_CTL_NTF_LIM,
WNI_CFG_EXCLUDE_UNENCRYPTED_STAMIN,
WNI_CFG_EXCLUDE_UNENCRYPTED_STAMAX,
WNI_CFG_EXCLUDE_UNENCRYPTED_STADEF},
{WNI_CFG_RTS_THRESHOLD,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
CFG_CTL_NTF_TARGET,
WNI_CFG_RTS_THRESHOLD_STAMIN,
WNI_CFG_RTS_THRESHOLD_STAMAX,
WNI_CFG_RTS_THRESHOLD_STADEF},
{WNI_CFG_SHORT_RETRY_LIMIT,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_SHORT_RETRY_LIMIT_STAMIN,
WNI_CFG_SHORT_RETRY_LIMIT_STAMAX,
WNI_CFG_SHORT_RETRY_LIMIT_STADEF},
{WNI_CFG_LONG_RETRY_LIMIT,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_LONG_RETRY_LIMIT_STAMIN,
WNI_CFG_LONG_RETRY_LIMIT_STAMAX,
WNI_CFG_LONG_RETRY_LIMIT_STADEF},
{WNI_CFG_FRAGMENTATION_THRESHOLD,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
CFG_CTL_NTF_TARGET,
@@ -160,42 +138,16 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT_STAMIN,
WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT_STAMAX,
WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT_STADEF},
{WNI_CFG_PS_ENABLE_BCN_FILTER,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_PS_ENABLE_BCN_FILTER_STAMIN,
WNI_CFG_PS_ENABLE_BCN_FILTER_STAMAX,
WNI_CFG_PS_ENABLE_BCN_FILTER_STADEF},
{WNI_CFG_PS_ENABLE_HEART_BEAT,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_PS_ENABLE_HEART_BEAT_STAMIN,
WNI_CFG_PS_ENABLE_HEART_BEAT_STAMAX,
WNI_CFG_PS_ENABLE_HEART_BEAT_STADEF},
{WNI_CFG_PS_ENABLE_RSSI_MONITOR,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_PS_ENABLE_RSSI_MONITOR_STAMIN,
WNI_CFG_PS_ENABLE_RSSI_MONITOR_STAMAX,
WNI_CFG_PS_ENABLE_RSSI_MONITOR_STADEF},
{WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT_STAMIN,
WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT_STAMAX,
WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT_STADEF},
{WNI_CFG_RF_SETTLING_TIME_CLK,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_RF_SETTLING_TIME_CLK_STAMIN,
WNI_CFG_RF_SETTLING_TIME_CLK_STAMAX,
WNI_CFG_RF_SETTLING_TIME_CLK_STADEF},
{WNI_CFG_SUPPORTED_RATES_11B,
CFG_CTL_VALID | CFG_CTL_RE,
0, 3, 1},
{WNI_CFG_SUPPORTED_RATES_11A, CFG_CTL_VALID | CFG_CTL_RE,
0, 255, 15},
{WNI_CFG_PHY_MODE,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
CFG_CTL_RESTART,
WNI_CFG_PHY_MODE_STAMIN,
WNI_CFG_PHY_MODE_STAMAX,
WNI_CFG_PHY_MODE_STADEF},
{WNI_CFG_DOT11_MODE,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT | CFG_CTL_RESTART |
CFG_CTL_NTF_LIM,
@@ -208,9 +160,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
{WNI_CFG_EXTENDED_OPERATIONAL_RATE_SET,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_RESTART,
0, 65535, 65534},
{WNI_CFG_PROPRIETARY_OPERATIONAL_RATE_SET,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_RESTART,
0, 0, 0},
{WNI_CFG_LISTEN_INTERVAL,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
CFG_CTL_RESTART,
@@ -221,16 +170,6 @@ 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_CURRENT_CHANNEL,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_INT,
WNI_CFG_CURRENT_CHANNEL_STAMIN,
WNI_CFG_CURRENT_CHANNEL_STAMAX,
WNI_CFG_CURRENT_CHANNEL_STADEF},
{WNI_CFG_DEFAULT_RATE_INDEX_24GHZ,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_DEFAULT_RATE_INDEX_24GHZ_STAMIN,
WNI_CFG_DEFAULT_RATE_INDEX_24GHZ_STAMAX,
WNI_CFG_DEFAULT_RATE_INDEX_24GHZ_STADEF},
{WNI_CFG_APSD_ENABLED,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_APSD_ENABLED_STAMIN,
@@ -496,21 +435,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
WNI_CFG_CHANNEL_BONDING_MODE_STAMIN,
WNI_CFG_CHANNEL_BONDING_MODE_STAMAX,
WNI_CFG_CHANNEL_BONDING_MODE_STADEF},
{WNI_CFG_DYNAMIC_THRESHOLD_ZERO,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_DYNAMIC_THRESHOLD_ZERO_STAMIN,
WNI_CFG_DYNAMIC_THRESHOLD_ZERO_STAMAX,
WNI_CFG_DYNAMIC_THRESHOLD_ZERO_STADEF},
{WNI_CFG_DYNAMIC_THRESHOLD_ONE,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_DYNAMIC_THRESHOLD_ONE_STAMIN,
WNI_CFG_DYNAMIC_THRESHOLD_ONE_STAMAX,
WNI_CFG_DYNAMIC_THRESHOLD_ONE_STADEF},
{WNI_CFG_DYNAMIC_THRESHOLD_TWO,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_DYNAMIC_THRESHOLD_TWO_STAMIN,
WNI_CFG_DYNAMIC_THRESHOLD_TWO_STAMAX,
WNI_CFG_DYNAMIC_THRESHOLD_TWO_STADEF},
{WNI_CFG_SCAN_CONTROL_LIST,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_RESTART |
CFG_CTL_NTF_LIM,
@@ -773,23 +697,12 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
WNI_CFG_MAX_PS_POLL_STAMIN,
WNI_CFG_MAX_PS_POLL_STAMAX,
WNI_CFG_MAX_PS_POLL_STADEF},
{WNI_CFG_RSSI_FILTER_PERIOD,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
CFG_CTL_NTF_LIM,
WNI_CFG_RSSI_FILTER_PERIOD_STAMIN,
WNI_CFG_RSSI_FILTER_PERIOD_STAMAX,
WNI_CFG_RSSI_FILTER_PERIOD_STADEF},
{WNI_CFG_SCAN_IN_POWERSAVE,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
CFG_CTL_NTF_LIM,
WNI_CFG_SCAN_IN_POWERSAVE_STAMIN,
WNI_CFG_SCAN_IN_POWERSAVE_STAMAX,
WNI_CFG_SCAN_IN_POWERSAVE_STADEF},
{WNI_CFG_IGNORE_DTIM,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_IGNORE_DTIM_STAMIN,
WNI_CFG_IGNORE_DTIM_STAMAX,
WNI_CFG_IGNORE_DTIM_STADEF},
{WNI_CFG_WOWLAN_UCAST_PATTERN_FILTER_ENABLE,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_WOWLAN_UCAST_PATTERN_FILTER_ENABLE_STAMIN,
@@ -820,22 +733,11 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
WNI_CFG_WOWLAN_MAX_SLEEP_PERIOD_STAMIN,
WNI_CFG_WOWLAN_MAX_SLEEP_PERIOD_STAMAX,
WNI_CFG_WOWLAN_MAX_SLEEP_PERIOD_STADEF},
{WNI_CFG_MAX_MEDIUM_TIME,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_MAX_MEDIUM_TIME_STAMIN,
WNI_CFG_MAX_MEDIUM_TIME_STAMAX,
WNI_CFG_MAX_MEDIUM_TIME_STADEF},
{WNI_CFG_IBSS_AUTO_BSSID,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_IBSS_AUTO_BSSID_STAMIN,
WNI_CFG_IBSS_AUTO_BSSID_STAMAX,
WNI_CFG_IBSS_AUTO_BSSID_STADEF},
{WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
CFG_CTL_NTF_LIM,
WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG_STAMIN,
WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG_STAMAX,
WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG_STADEF},
{WNI_CFG_WPS_ENABLE,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
CFG_CTL_NTF_LIM,
@@ -887,51 +789,21 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
WNI_CFG_WPS_DEVICE_PASSWORD_ID_STAMIN,
4294967295u,
WNI_CFG_WPS_DEVICE_PASSWORD_ID_STADEF},
{WNI_CFG_LOW_GAIN_OVERRIDE,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_LOW_GAIN_OVERRIDE_STAMIN,
WNI_CFG_LOW_GAIN_OVERRIDE_STAMAX,
WNI_CFG_LOW_GAIN_OVERRIDE_STADEF},
{WNI_CFG_SINGLE_TID_RC,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_SINGLE_TID_RC_STAMIN,
WNI_CFG_SINGLE_TID_RC_STAMAX,
WNI_CFG_SINGLE_TID_RC_STADEF},
{WNI_CFG_DYNAMIC_PS_POLL_VALUE,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_DYNAMIC_PS_POLL_VALUE_STAMIN,
WNI_CFG_DYNAMIC_PS_POLL_VALUE_STAMAX,
WNI_CFG_DYNAMIC_PS_POLL_VALUE_STADEF},
{WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT_STAMIN,
WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT_STAMAX,
WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT_STADEF},
{WNI_CFG_TELE_BCN_WAKEUP_EN,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_TELE_BCN_WAKEUP_EN_STAMIN,
WNI_CFG_TELE_BCN_WAKEUP_EN_STAMAX,
WNI_CFG_TELE_BCN_WAKEUP_EN_STADEF},
{WNI_CFG_TELE_BCN_TRANS_LI,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_TELE_BCN_TRANS_LI_STAMIN,
WNI_CFG_TELE_BCN_TRANS_LI_STAMAX,
WNI_CFG_TELE_BCN_TRANS_LI_STADEF},
{WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS_STAMIN,
WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS_STAMAX,
WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS_STADEF},
{WNI_CFG_TELE_BCN_MAX_LI,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_TELE_BCN_MAX_LI_STAMIN,
WNI_CFG_TELE_BCN_MAX_LI_STAMAX,
WNI_CFG_TELE_BCN_MAX_LI_STADEF},
{WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS_STAMIN,
WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS_STAMAX,
WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS_STADEF},
{WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD_STAMIN,
@@ -943,11 +815,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
WNI_CFG_ASSOC_STA_LIMIT_STAMIN,
WNI_CFG_ASSOC_STA_LIMIT_STAMAX,
WNI_CFG_ASSOC_STA_LIMIT_STADEF},
{WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD_STAMIN,
WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD_STAMAX,
WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD_STADEF},
{WNI_CFG_ENABLE_LTE_COEX,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_ENABLE_LTE_COEX_STAMIN,
@@ -968,11 +835,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
WNI_CFG_ENABLE_MC_ADDR_LIST_STAMIN,
WNI_CFG_ENABLE_MC_ADDR_LIST_STAMAX,
WNI_CFG_ENABLE_MC_ADDR_LIST_STADEF},
{WNI_CFG_ENABLE_LPWR_IMG_TRANSITION,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_ENABLE_LPWR_IMG_TRANSITION_STAMIN,
WNI_CFG_ENABLE_LPWR_IMG_TRANSITION_STAMAX,
WNI_CFG_ENABLE_LPWR_IMG_TRANSITION_STADEF},
{WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED_STAMIN,
@@ -1024,16 +886,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL_STAMIN,
WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL_STAMAX,
WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL_STADEF},
{WNI_CFG_ENABLE_ADAPT_RX_DRAIN,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_ENABLE_ADAPT_RX_DRAIN_STAMIN,
WNI_CFG_ENABLE_ADAPT_RX_DRAIN_STAMAX,
WNI_CFG_ENABLE_ADAPT_RX_DRAIN_STADEF},
{WNI_CFG_ANTENNA_DIVESITY,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_ANTENNA_DIVESITY_STAMIN,
WNI_CFG_ANTENNA_DIVESITY_STAMAX,
WNI_CFG_ANTENNA_DIVESITY_STADEF},
{WNI_CFG_GO_LINK_MONITOR_TIMEOUT,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_GO_LINK_MONITOR_TIMEOUT_STAMIN,
@@ -1635,10 +1487,6 @@ cfgstatic_string cfg_static_string[CFG_MAX_STATIC_STRING] = {
WNI_CFG_EXTENDED_OPERATIONAL_RATE_SET_LEN,
0,
{0} },
{WNI_CFG_PROPRIETARY_OPERATIONAL_RATE_SET,
WNI_CFG_PROPRIETARY_OPERATIONAL_RATE_SET_LEN,
4,
{1, 3, 5, 7} },
{WNI_CFG_VALID_CHANNEL_LIST,
WNI_CFG_VALID_CHANNEL_LIST_LEN,
55,

52
core/mac/src/pe/lim/lim_process_cfg_updates.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
* Copyright (c) 2012-2018 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -48,21 +48,6 @@
static void lim_update_config(tpAniSirGlobal pMac, tpPESession psessionEntry);
static void lim_set_default_key_id_and_keys(tpAniSirGlobal pMac)
{
#ifdef FIXME_GEN6
uint32_t val;
uint32_t dkCfgId;
pe_debug("Setting default keys at SP");
if (wlan_cfg_get_int(pMac, WNI_CFG_WEP_DEFAULT_KEYID,
&val) != eSIR_SUCCESS) {
pe_err("Unable to retrieve defaultKeyId from CFG");
}
dkCfgId = limGetCfgIdOfDefaultKeyid(val);
#endif
} /*** end lim_set_default_key_id_and_keys() ***/
/** -------------------------------------------------------------
\fn lim_set_cfg_protection
\brief sets lim global cfg cache from the config.
@@ -204,25 +189,6 @@ void lim_handle_cf_gparam_update(tpAniSirGlobal pMac, uint32_t cfgId)
pe_debug("Handling CFG parameter id %X update", cfgId);
switch (cfgId) {
case WNI_CFG_WEP_DEFAULT_KEYID:
/* !!LAC - when the default KeyID is changed, force all of the */
/* keys and the keyID to be reprogrammed. this allows the */
/* keys to change after the initial setting of the keys when the CFG was */
/* applied at association time through CFG changes of the keys. */
lim_set_default_key_id_and_keys(pMac);
break;
case WNI_CFG_EXCLUDE_UNENCRYPTED:
if (wlan_cfg_get_int(pMac, WNI_CFG_EXCLUDE_UNENCRYPTED,
&val1) != eSIR_SUCCESS) {
pe_err("Unable to retrieve excludeUnencr from CFG");
}
pe_err("Unsupported CFG: WNI_CFG_EXCLUDE_UNENCRYPTED");
break;
case WNI_CFG_ASSOCIATION_FAILURE_TIMEOUT:
if (pMac->lim.gLimMlmState != eLIM_MLM_WT_ASSOC_RSP_STATE) {
/* 'Change' timer for future activations */
@@ -235,19 +201,6 @@ void lim_handle_cf_gparam_update(tpAniSirGlobal pMac, uint32_t cfgId)
case WNI_CFG_PROTECTION_ENABLED:
lim_set_cfg_protection(pMac, NULL);
break;
case WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG:
{
struct scheduler_msg msg = { 0 };
uint32_t status;
msg.type = SIR_LIM_UPDATE_BEACON;
status = lim_post_msg_api(pMac, &msg);
if (status != TX_SUCCESS)
pe_err("Failed lim_post_msg_api %u", status);
break;
}
case WNI_CFG_MPDU_DENSITY:
if (wlan_cfg_get_int(pMac, WNI_CFG_HT_AMPDU_PARAMS, &val1) !=
@@ -348,9 +301,6 @@ void lim_apply_configuration(tpAniSirGlobal pMac, tpPESession psessionEntry)
lim_get_phy_mode(pMac, &phyMode, psessionEntry);
/* Set default keyId and keys */
lim_set_default_key_id_and_keys(pMac);
lim_update_config(pMac, psessionEntry);
lim_get_short_slot_from_phy_mode(pMac, psessionEntry, phyMode,

12
core/sme/src/common/sme_api.c
View File

@@ -7095,17 +7095,7 @@ QDF_STATUS sme_update_enable_fast_roam_in_concurrency(tHalHandle hHal,
QDF_STATUS sme_update_config_fw_rssi_monitoring(tHalHandle hHal,
bool fEnableFwRssiMonitoring)
{
QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS;
if (sme_cfg_set_int (hHal, WNI_CFG_PS_ENABLE_RSSI_MONITOR,
fEnableFwRssiMonitoring) ==
QDF_STATUS_E_FAILURE) {
qdf_ret_status = QDF_STATUS_E_FAILURE;
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
"Could not pass on WNI_CFG_PS_RSSI_MONITOR to CFG");
}
return qdf_ret_status;
return QDF_STATUS_SUCCESS;
}
/*

49
core/sme/src/csr/csr_api_roam.c
View File

@@ -5078,7 +5078,6 @@ void csr_set_cfg_privacy(tpAniSirGlobal pMac, struct csr_roam_profile *pProfile,
cfg_set_str(pMac, WNI_CFG_WEP_DEFAULT_KEY_2, Key1, Key1Length);
cfg_set_str(pMac, WNI_CFG_WEP_DEFAULT_KEY_3, Key2, Key2Length);
cfg_set_str(pMac, WNI_CFG_WEP_DEFAULT_KEY_4, Key3, Key3Length);
cfg_set_int(pMac, WNI_CFG_WEP_KEY_LENGTH, WepKeyLength);
cfg_set_int(pMac, WNI_CFG_WEP_DEFAULT_KEYID, WepDefaultKeyId);
}
@@ -5327,11 +5326,6 @@ static void csr_set_cfg_rate_set_from_profile(tpAniSirGlobal pMac,
SIR_MAC_RATE_2,
SIR_MAC_RATE_5_5,
SIR_MAC_RATE_11} } };
tSirMacPropRateSet DefaultSupportedPropRates = { 3,
{SIR_MAC_RATE_72,
SIR_MAC_RATE_96,
SIR_MAC_RATE_108} };
enum csr_cfgdot11mode cfgDot11Mode;
enum band_info eBand;
/* leave enough room for the max number of rates */
@@ -5341,10 +5335,6 @@ static void csr_set_cfg_rate_set_from_profile(tpAniSirGlobal pMac,
uint8_t ExtendedOperationalRates
[CSR_DOT11_EXTENDED_SUPPORTED_RATES_MAX];
uint32_t ExtendedOperationalRatesLength = 0;
/* leave enough room for the max number of proprietary rates */
uint8_t ProprietaryOperationalRates[4];
uint32_t ProprietaryOperationalRatesLength = 0;
uint32_t PropRatesEnable = 0;
uint8_t operationChannel = 0;
if (pProfile->ChannelInfo.ChannelList)
@@ -5369,18 +5359,6 @@ static void csr_set_cfg_rate_set_from_profile(tpAniSirGlobal pMac,
/* Nothing in the Extended rate set. */
ExtendedOperationalRatesLength = 0;
/* populate proprietary rates if user allows them */
if (pMac->roam.configParam.ProprietaryRatesEnabled) {
ProprietaryOperationalRatesLength =
DefaultSupportedPropRates.numPropRates *
sizeof(*DefaultSupportedPropRates.propRate);
qdf_mem_copy(ProprietaryOperationalRates,
DefaultSupportedPropRates.propRate,
ProprietaryOperationalRatesLength);
} else {
/* No proprietary modes */
ProprietaryOperationalRatesLength = 0;
}
} else if (eCSR_CFG_DOT11_MODE_11B == cfgDot11Mode) {
/* 11b rates into the Operational Rate Set. */
OperationalRatesLength =
@@ -5391,8 +5369,6 @@ static void csr_set_cfg_rate_set_from_profile(tpAniSirGlobal pMac,
OperationalRatesLength);
/* Nothing in the Extended rate set. */
ExtendedOperationalRatesLength = 0;
/* No proprietary modes */
ProprietaryOperationalRatesLength = 0;
} else {
/* 11G */
@@ -5411,28 +5387,6 @@ static void csr_set_cfg_rate_set_from_profile(tpAniSirGlobal pMac,
qdf_mem_copy(ExtendedOperationalRates,
DefaultSupportedRates11a.supportedRateSet.rate,
ExtendedOperationalRatesLength);
/* populate proprietary rates if user allows them */
if (pMac->roam.configParam.ProprietaryRatesEnabled) {
ProprietaryOperationalRatesLength =
DefaultSupportedPropRates.numPropRates *
sizeof(*DefaultSupportedPropRates.propRate);
qdf_mem_copy(ProprietaryOperationalRates,
DefaultSupportedPropRates.propRate,
ProprietaryOperationalRatesLength);
} else {
/* No proprietary modes */
ProprietaryOperationalRatesLength = 0;
}
}
/* set this to 1 if prop. rates need to be advertised in to the
* IBSS beacon and user wants to use them
*/
if (ProprietaryOperationalRatesLength
&& pMac->roam.configParam.ProprietaryRatesEnabled) {
PropRatesEnable = 1;
} else {
PropRatesEnable = 0;
}
/* Set the operational rate set CFG variables... */
@@ -5441,9 +5395,6 @@ static void csr_set_cfg_rate_set_from_profile(tpAniSirGlobal pMac,
cfg_set_str(pMac, WNI_CFG_EXTENDED_OPERATIONAL_RATE_SET,
ExtendedOperationalRates,
ExtendedOperationalRatesLength);
cfg_set_str(pMac, WNI_CFG_PROPRIETARY_OPERATIONAL_RATE_SET,
ProprietaryOperationalRates,
ProprietaryOperationalRatesLength);
}
void csr_roam_ccm_cfg_set_callback(tpAniSirGlobal pMac, int32_t result,