From a34d51b747eafee9b993514c884d8fa70f33a74e Mon Sep 17 00:00:00 2001
From: gaurank kathpalia <gkathpal@codeaurora.org>
Date: Tue, 1 Sep 2020 20:53:17 +0530
Subject: [PATCH] qcacmn: Add get API for assoc disallowed param

Add public API to get the value of assoc disallowed
param.

Change-Id: Id97219be71a54a2edc5fb266026710387dfee143
CRs-Fixed: 2767492
---
 .../core/src/wlan_cm_bss_scoring.c            | 94 +++++++++++--------
 .../dispatcher/inc/wlan_cm_bss_score_param.h  | 12 +++
 2 files changed, 69 insertions(+), 37 deletions(-)

diff --git a/umac/mlme/connection_mgr/core/src/wlan_cm_bss_scoring.c b/umac/mlme/connection_mgr/core/src/wlan_cm_bss_scoring.c
index 05565ff045ae..eb00cce4630c 100644
--- a/umac/mlme/connection_mgr/core/src/wlan_cm_bss_scoring.c
+++ b/umac/mlme/connection_mgr/core/src/wlan_cm_bss_scoring.c
@@ -733,6 +733,56 @@ cm_calculate_oce_ap_tx_pwr_weightage(struct scan_cache_entry *entry,
 	return score;
 }
 
+static bool cm_is_assoc_allowed(struct psoc_mlme_obj *mlme_psoc_obj,
+				struct scan_cache_entry *entry)
+{
+	uint8_t reason;
+	uint8_t *mbo_oce;
+	bool check_assoc_disallowed;
+
+	mbo_oce = util_scan_entry_mbo_oce(entry);
+
+	check_assoc_disallowed =
+	   mlme_psoc_obj->psoc_cfg.score_config.check_assoc_disallowed;
+
+	if (check_assoc_disallowed &&
+	    wlan_parse_oce_assoc_disallowed_ie(mbo_oce, &reason)) {
+		mlme_nofl_debug("Candidate("QDF_MAC_ADDR_FMT" freq %d): rssi %d, assoc disallowed set in MBO/OCE IE reason %d",
+				QDF_MAC_ADDR_REF(entry->bssid.bytes),
+				entry->channel.chan_freq,
+				entry->rssi_raw, reason);
+		return false;
+	}
+
+	return true;
+}
+
+void wlan_cm_set_check_assoc_disallowed(struct wlan_objmgr_psoc *psoc,
+					bool value)
+{
+	struct psoc_mlme_obj *mlme_psoc_obj;
+
+	mlme_psoc_obj = wlan_psoc_mlme_get_cmpt_obj(psoc);
+	if (!mlme_psoc_obj)
+		return;
+
+	mlme_psoc_obj->psoc_cfg.score_config.check_assoc_disallowed = value;
+}
+
+void wlan_cm_get_check_assoc_disallowed(struct wlan_objmgr_psoc *psoc,
+					bool *value)
+{
+	struct psoc_mlme_obj *mlme_psoc_obj;
+
+	mlme_psoc_obj = wlan_psoc_mlme_get_cmpt_obj(psoc);
+	if (!mlme_psoc_obj) {
+		*value = false;
+		return;
+	}
+
+	*value = mlme_psoc_obj->psoc_cfg.score_config.check_assoc_disallowed;
+}
+
 #else
 static bool
 cm_get_pcl_weight_of_channel(uint32_t chan_freq,
@@ -769,6 +819,12 @@ cm_calculate_oce_ap_tx_pwr_weightage(struct scan_cache_entry *entry,
 {
 	return 0;
 }
+
+static inline bool cm_is_assoc_allowed(struct psoc_mlme_obj *mlme_psoc_obj,
+				       struct scan_cache_entry *entry)
+{
+	return true;
+}
 #endif
 
 /**
@@ -1020,30 +1076,6 @@ static void cm_list_insert_sorted(qdf_list_t *scan_list,
 		qdf_list_insert_back(scan_list, &scan_entry->node);
 }
 
-static bool cm_is_assoc_allowed(struct psoc_mlme_obj *mlme_psoc_obj,
-				struct scan_cache_entry *entry)
-{
-	uint8_t reason;
-	uint8_t *mbo_oce;
-	bool check_assoc_disallowed;
-
-	mbo_oce = util_scan_entry_mbo_oce(entry);
-
-	check_assoc_disallowed =
-	   mlme_psoc_obj->psoc_cfg.score_config.check_assoc_disallowed;
-
-	if (check_assoc_disallowed &&
-	    wlan_parse_oce_assoc_disallowed_ie(mbo_oce, &reason)) {
-		mlme_nofl_debug("Candidate("QDF_MAC_ADDR_FMT" freq %d): rssi %d, assoc disallowed set in MBO/OCE IE reason %d",
-				QDF_MAC_ADDR_REF(entry->bssid.bytes),
-				entry->channel.chan_freq,
-				entry->rssi_raw, reason);
-		return false;
-	}
-
-	return true;
-}
-
 void wlan_cm_calculate_bss_score(struct wlan_objmgr_pdev *pdev,
 				 struct pcl_freq_weight_list *pcl_lst,
 				 qdf_list_t *scan_list,
@@ -1316,17 +1348,5 @@ void wlan_cm_init_score_config(struct wlan_objmgr_psoc *psoc,
 			cfg_get(psoc, CFG_SCORING_BAND_WEIGHT_PER_IDX));
 	score_cfg->is_bssid_hint_priority =
 			cfg_get(psoc, CFG_IS_BSSID_HINT_PRIORITY);
-	score_cfg->check_assoc_disallowed = false;
-}
-
-void wlan_cm_set_check_assoc_disallowed(struct wlan_objmgr_psoc *psoc,
-					bool value)
-{
-	struct psoc_mlme_obj *mlme_psoc_obj;
-
-	mlme_psoc_obj = wlan_psoc_mlme_get_cmpt_obj(psoc);
-	if (!mlme_psoc_obj)
-		return;
-
-	mlme_psoc_obj->psoc_cfg.score_config.check_assoc_disallowed = value;
+	score_cfg->check_assoc_disallowed = true;
 }
diff --git a/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_bss_score_param.h b/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_bss_score_param.h
index fe2d22a00a8f..a9389ebed2b3 100644
--- a/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_bss_score_param.h
+++ b/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_bss_score_param.h
@@ -200,6 +200,7 @@ void wlan_cm_calculate_bss_score(struct wlan_objmgr_pdev *pdev,
 void wlan_cm_init_score_config(struct wlan_objmgr_psoc *psoc,
 			       struct scoring_cfg *score_cfg);
 
+#ifdef CONN_MGR_ADV_FEATURE
 /**
  * wlan_cm_set_check_assoc_disallowed() - Set check assoc disallowed param
  * @psoc: pointer to psoc object
@@ -209,4 +210,15 @@ void wlan_cm_init_score_config(struct wlan_objmgr_psoc *psoc,
  */
 void wlan_cm_set_check_assoc_disallowed(struct wlan_objmgr_psoc *psoc,
 					bool value);
+
+/**
+ * wlan_cm_get_check_assoc_disallowed() - get check assoc disallowed param
+ * @psoc: pointer to psoc object
+ * @value: value to be filled
+ *
+ * Return: void
+ */
+void wlan_cm_get_check_assoc_disallowed(struct wlan_objmgr_psoc *psoc,
+					bool *value);
+#endif
 #endif