qcacld-3.0: Discard 5G candidates based on RSSI threshold
To discard 5G candidates based on RSSI threshold, Introduce
a new INI "min_rssi_for_2g_to_5g_roam" to configure the RSSI
for High RSSI Trigger.
Min: -120
Max: 0
Default: -70
Change-Id: If4545296ef1b53d18b8ae4abf12d450f5e690240
CRs-Fixed: 2789017
diff --git a/components/mlme/core/src/wlan_mlme_main.c b/components/mlme/core/src/wlan_mlme_main.c
index 9910eb9..2400b97 100644
--- a/components/mlme/core/src/wlan_mlme_main.c
+++ b/components/mlme/core/src/wlan_mlme_main.c
@@ -2218,6 +2218,12 @@
min_rssi_param->min_rssi =
cfg_get(psoc, CFG_BMISS_ROAM_MIN_RSSI);
min_rssi_param->trigger_reason = ROAM_TRIGGER_REASON_BMISS;
+
+ min_rssi_param = &mlme_cfg->trig_min_rssi[MIN_RSSI_2G_TO_5G_ROAM];
+ min_rssi_param->min_rssi =
+ cfg_get(psoc, CFG_2G_TO_5G_ROAM_MIN_RSSI);
+ min_rssi_param->trigger_reason = ROAM_TRIGGER_REASON_HIGH_RSSI;
+
}
/**
diff --git a/components/mlme/dispatcher/inc/cfg_mlme_scoring.h b/components/mlme/dispatcher/inc/cfg_mlme_scoring.h
index cbcb0e9..ca61552 100644
--- a/components/mlme/dispatcher/inc/cfg_mlme_scoring.h
+++ b/components/mlme/dispatcher/inc/cfg_mlme_scoring.h
@@ -1171,6 +1171,33 @@
/*
* <ini>
+ * min_rssi_for_2g_to_5g_roam - Candidate AP minimum RSSI for
+ * 2G to 5G roam trigger (in dBm)
+ * @Min: -120
+ * @Max: 0
+ * @Default: -70
+ *
+ * Minimum RSSI value of the candidate AP to consider it as candidate
+ * for 2G to 5G roam.
+ *
+ * Related: None
+ *
+ * Supported Feature: Roaming
+ *
+ * Usage: Internal/External
+ *
+ * </ini>
+ */
+#define CFG_2G_TO_5G_ROAM_MIN_RSSI CFG_INI_INT( \
+ "min_rssi_for_2g_to_5g_roam", \
+ -120, \
+ 0, \
+ -70, \
+ CFG_VALUE_OR_DEFAULT, \
+ "Minimum RSSI of candidate AP for 2G to 5G roam trigger")
+
+/*
+ * <ini>
* idle_roam_score_delta - Roam score delta value in percentage for idle roam.
* @Min: 0
* @Max: 100
@@ -1295,6 +1322,7 @@
CFG(CFG_APSD_ENABLED) \
CFG(CFG_DISCONNECT_ROAM_TRIGGER_MIN_RSSI) \
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) \
diff --git a/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h b/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h
index ae0f512..920b268 100644
--- a/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h
+++ b/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h
@@ -2380,7 +2380,7 @@
struct wlan_mlme_dot11_mode dot11_mode;
struct wlan_mlme_reg reg;
struct roam_trigger_score_delta trig_score_delta[NUM_OF_ROAM_TRIGGERS];
- struct roam_trigger_min_rssi trig_min_rssi[NUM_OF_ROAM_TRIGGERS];
+ struct roam_trigger_min_rssi trig_min_rssi[NUM_OF_ROAM_MIN_RSSI];
};
enum pkt_origin {
diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h
index ef964f8..70c9d6a 100644
--- a/core/mac/inc/sir_api.h
+++ b/core/mac/inc/sir_api.h
@@ -2314,7 +2314,7 @@
uint32_t roam_inactive_data_packet_count;
uint32_t roam_scan_period_after_inactivity;
uint32_t btm_query_bitmask;
- struct roam_trigger_min_rssi min_rssi_params[NUM_OF_ROAM_TRIGGERS];
+ struct roam_trigger_min_rssi min_rssi_params[NUM_OF_ROAM_MIN_RSSI];
struct roam_trigger_score_delta score_delta_param[NUM_OF_ROAM_TRIGGERS];
uint32_t full_roam_scan_period;
};
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index 5380820..079ad4b 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -18794,6 +18794,9 @@
mac_ctx->mlme_cfg->trig_min_rssi[DEAUTH_MIN_RSSI];
req_buf->min_rssi_params[BMISS_MIN_RSSI] =
mac_ctx->mlme_cfg->trig_min_rssi[BMISS_MIN_RSSI];
+ req_buf->min_rssi_params[MIN_RSSI_2G_TO_5G_ROAM] =
+ mac_ctx->mlme_cfg->trig_min_rssi[MIN_RSSI_2G_TO_5G_ROAM];
+
req_buf->score_delta_param[IDLE_ROAM_TRIGGER] =
mac_ctx->mlme_cfg->trig_score_delta[IDLE_ROAM_TRIGGER];
req_buf->score_delta_param[BTM_ROAM_TRIGGER] =
diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c
index 782178f..c822713 100644
--- a/core/wma/src/wma_scan_roam.c
+++ b/core/wma/src/wma_scan_roam.c
@@ -1330,6 +1330,8 @@
roam_req->min_rssi_params[DEAUTH_MIN_RSSI];
ap_profile.min_rssi_params[BMISS_MIN_RSSI] =
roam_req->min_rssi_params[BMISS_MIN_RSSI];
+ ap_profile.min_rssi_params[MIN_RSSI_2G_TO_5G_ROAM] =
+ roam_req->min_rssi_params[MIN_RSSI_2G_TO_5G_ROAM];
if (!db2dbm_enabled) {
ap_profile.min_rssi_params[DEAUTH_MIN_RSSI].min_rssi -=
WMA_NOISE_FLOOR_DBM_DEFAULT;
@@ -1340,6 +1342,10 @@
WMA_NOISE_FLOOR_DBM_DEFAULT;
ap_profile.min_rssi_params[BMISS_MIN_RSSI].min_rssi &=
0x000000ff;
+ ap_profile.min_rssi_params[MIN_RSSI_2G_TO_5G_ROAM].min_rssi -=
+ WMA_NOISE_FLOOR_DBM_DEFAULT;
+ ap_profile.min_rssi_params[MIN_RSSI_2G_TO_5G_ROAM].min_rssi &=
+ 0x000000ff;
}
ap_profile.score_delta_param[IDLE_ROAM_TRIGGER] =