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

qcacld-3.0: move ini CFG_VENDOR_ROAM_SCORE_ALGORITHM to cmn

Browse Source 
Move ini CFG_VENDOR_ROAM_SCORE_ALGORITHM from qcacld-3.0 to qcacmn part.
from qcacld-3.0: mac_ctx->mlme_cfg->roam_scoring
to qcacmn: mlme_psoc_obj->psoc_cfg.score_config.

Change-Id: I318f0d516ce699c061f268116e1cbf79fcc9e23a
CRs-Fixed: 2806090
This commit is contained in:
Jianmin Zhu
2020-11-02 22:42:25 +08:00
committed by snandini
parent a61cf45a7f
commit 355722bcae
4 changed files with 3 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/mlme/core/src/wlan_mlme_main.c
View File

@@ -1833,8 +1833,6 @@ static void mlme_init_power_cfg(struct wlan_objmgr_psoc *psoc,
static void mlme_init_roam_scoring_cfg(struct wlan_objmgr_psoc *psoc,
struct wlan_mlme_roam_scoring_cfg *scoring_cfg)
{
scoring_cfg->vendor_roam_score_algorithm =
cfg_get(psoc, CFG_VENDOR_ROAM_SCORE_ALGORITHM);
scoring_cfg->enable_scoring_for_roam =
cfg_get(psoc, CFG_ENABLE_SCORING_FOR_ROAM);
scoring_cfg->roam_trigger_bitmap =

31
components/mlme/dispatcher/inc/cfg_mlme_roam_scoring.h
View File

@@ -314,34 +314,6 @@
CFG_VALUE_OR_DEFAULT, \
"Roam score delta for BTM roam trigger")
/*
* <ini>
* vendor_roam_score_algorithm - Algorithm to calculate AP score
* @Min: 0
* @Max: 1
* @Default: 0
*
* By default the value is 0 and default roam algorithm will be used.
* When the value is 1, the V2 roaming algorithm will be used:
* For this V2 algo, AP score calculation is based on below equation:
* AP Score = (RSSIfactor * rssiweight(0.65)) + (CUfactor *cuweight(0.35))
*
* Related: None
*
* Supported Feature: roam score algorithm
*
* Usage: External
*
* </ini>
*/
#define CFG_VENDOR_ROAM_SCORE_ALGORITHM CFG_INI_UINT( \
"vendor_roam_score_algorithm", \
0, \
1, \
0, \
CFG_VALUE_OR_DEFAULT, \
"Roam candidate selection score algorithm")
#define CFG_ROAM_SCORING_ALL \
CFG(CFG_ROAM_SCORE_DELTA_TRIGGER_BITMAP) \
CFG(CFG_ROAM_SCORE_DELTA) \
@@ -352,7 +324,6 @@
CFG(CFG_BMISS_ROAM_MIN_RSSI) \
CFG(CFG_2G_TO_5G_ROAM_MIN_RSSI) \
CFG(CFG_IDLE_ROAM_SCORE_DELTA) \
CFG(CFG_BTM_ROAM_SCORE_DELTA) \
CFG(CFG_VENDOR_ROAM_SCORE_ALGORITHM)
CFG(CFG_BTM_ROAM_SCORE_DELTA)
#endif /* __CFG_MLME_ROAM_SCORING_H */

2
components/mlme/dispatcher/inc/wlan_mlme_public_struct.h
View File

@@ -2045,7 +2045,6 @@ struct wlan_mlme_rssi_cfg_score {
* @roam_trigger_bitmap: bitmap for various roam triggers
* @roam_score_delta: percentage delta in roam score
* @apsd_enabled: Enable automatic power save delivery
* @vendor_roam_score_algorithm: Preferred vendor roam score algorithm
* @min_roam_score_delta: Minimum difference between connected AP's and
* candidate AP's roam score to start roaming.
*/
@@ -2054,7 +2053,6 @@ struct wlan_mlme_roam_scoring_cfg {
uint32_t roam_trigger_bitmap;
uint32_t roam_score_delta;
bool apsd_enabled;
uint32_t vendor_roam_score_algorithm;
uint32_t min_roam_score_delta;
};

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

@@ -17334,7 +17334,8 @@ static void csr_update_score_params(struct mac_context *mac_ctx,
score_config->nss_weight_per_index;
req_score_params->vendor_roam_score_algorithm =
roam_score_params->vendor_roam_score_algorithm;
score_config->vendor_roam_score_algorithm;
req_score_params->roam_score_delta =
roam_score_params->roam_score_delta;