qcacld-3.0: Disable hi-rssi roam trigger when roamed to 6Ghz band

Host driver enables hi-rssi roam trigger when STA roams to 6Ghz
AP. But hi-rssi trigger should be enabled only for 2.4Ghz AP
else it will cause frequent roams even though connected to
good candidate AP.

Disable hi-rssi roam when roamed to 6Ghz band AP.

Change-Id: I2ea2d06634963c1190aa1ca0d466b0873e36fbfe
CRs-Fixed: 3001090

components/umac/mlme/connection_mgr/core/src/wlan_cm_roam_fw_sync.c

@@ -901,14 +901,14 @@ QDF_STATUS cm_fw_roam_complete(struct cnx_mgr *cm_ctx, void *data)
 	if (ucfg_pkt_capture_get_pktcap_mode(psoc))
 		ucfg_pkt_capture_record_channel(cm_ctx->vdev);
 
-	if (WLAN_REG_IS_5GHZ_CH_FREQ(roam_synch_data->chan_freq)) {
+	if (WLAN_REG_IS_24GHZ_CH_FREQ(roam_synch_data->chan_freq)) {
+		wlan_cm_set_disable_hi_rssi(pdev,
+					    vdev_id, false);
+	} else {
 		wlan_cm_set_disable_hi_rssi(pdev,
 					    vdev_id, true);
 		mlme_debug("Disabling HI_RSSI, AP freq=%d rssi %d",
 			   roam_synch_data->chan_freq, roam_synch_data->rssi);
-	} else {
-		wlan_cm_set_disable_hi_rssi(pdev,
-					    vdev_id, false);
 	}
 	policy_mgr_check_n_start_opportunistic_timer(psoc);
 

core/mac/src/pe/lim/lim_process_sme_req_messages.c

@@ -2804,16 +2804,16 @@ lim_fill_pe_session(struct mac_context *mac_ctx, struct pe_session *session,
 	lim_fill_11r_params(mac_ctx, session , ese_ver_present);
 	lim_fill_ese_params(mac_ctx, session, ese_ver_present);
 
-
-	if (WLAN_REG_IS_5GHZ_CH_FREQ(bss_desc->chan_freq)) {
+	if (WLAN_REG_IS_24GHZ_CH_FREQ(bss_desc->chan_freq)) {
+		wlan_cm_set_disable_hi_rssi(mac_ctx->pdev, session->vdev_id,
+					    false);
+	} else {
 		wlan_cm_set_disable_hi_rssi(mac_ctx->pdev, session->vdev_id,
 					    true);
 		pe_debug("Disabling HI_RSSI, AP freq=%d, rssi=%d",
 			  bss_desc->chan_freq, bss_desc->rssi);
-	} else {
-		wlan_cm_set_disable_hi_rssi(mac_ctx->pdev, session->vdev_id,
-					    false);
 	}
+
 	if (session->opmode == QDF_STA_MODE)
 		session->enable_bcast_probe_rsp =
 			mac_ctx->mlme_cfg->oce.enable_bcast_probe_rsp;