From 5555231c56ffc0f35239625eb51d6600ead3bb3c Mon Sep 17 00:00:00 2001 From: Jianmin Zhu Date: Tue, 27 Oct 2020 16:45:08 +0800 Subject: [PATCH] qcacld-3.0: move ini CFG_VENDOR_ROAM_SCORE_ALGORITHM to cmn 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 --- components/mlme/core/src/wlan_mlme_main.c | 2 -- .../dispatcher/inc/cfg_mlme_roam_scoring.h | 31 +------------------ .../dispatcher/inc/wlan_mlme_public_struct.h | 2 -- core/sme/src/csr/csr_api_roam.c | 3 +- 4 files changed, 3 insertions(+), 35 deletions(-) diff --git a/components/mlme/core/src/wlan_mlme_main.c b/components/mlme/core/src/wlan_mlme_main.c index 22b776a0bac4..eb67fac52872 100644 --- a/components/mlme/core/src/wlan_mlme_main.c +++ b/components/mlme/core/src/wlan_mlme_main.c @@ -1832,8 +1832,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 = diff --git a/components/mlme/dispatcher/inc/cfg_mlme_roam_scoring.h b/components/mlme/dispatcher/inc/cfg_mlme_roam_scoring.h index 1d52767f8e86..754e4bb5a0fd 100644 --- a/components/mlme/dispatcher/inc/cfg_mlme_roam_scoring.h +++ b/components/mlme/dispatcher/inc/cfg_mlme_roam_scoring.h @@ -287,34 +287,6 @@ CFG_VALUE_OR_DEFAULT, \ "Roam score delta for BTM roam trigger") -/* - * - * 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 - * - * - */ -#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) \ @@ -324,7 +296,6 @@ CFG(CFG_DISCONNECT_ROAM_TRIGGER_MIN_RSSI) \ CFG(CFG_BMISS_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 */ diff --git a/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h b/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h index 1481d5d137a4..8facb721c131 100644 --- a/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h +++ b/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h @@ -1985,7 +1985,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. */ @@ -1994,7 +1993,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; }; diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 8a68f3614e23..6289aaece3ff 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -18835,7 +18835,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;