qcacld-3.0: Conditional reading of 5G preferred parameters

Read 5G preferred parameters if only enable_5g_band_pref enabled.
Delete unused variables.

Change-Id: I5e3a8435034dbc7682b9da4327dd6067d2033951
CRs-Fixed: 2367136

components/mlme/core/src/wlan_mlme_main.c

@@ -1371,18 +1371,22 @@ static void mlme_init_lfr_cfg(struct wlan_objmgr_psoc *psoc,
 		cfg_get(psoc, CFG_LFR3_ROAM_RSSI_CHANNEL_PENALIZATION);
 	lfr->lfr3_num_disallowed_aps =
 		cfg_get(psoc, CFG_LFR3_ROAM_NUM_DISALLOWED_APS);
-	lfr->rssi_boost_threshold_5g =
-		cfg_get(psoc, CFG_LFR_5G_RSSI_BOOST_THRESHOLD);
-	lfr->rssi_boost_factor_5g =
-		cfg_get(psoc, CFG_LFR_5G_RSSI_BOOST_FACTOR);
-	lfr->max_rssi_boost_5g =
-		cfg_get(psoc, CFG_LFR_5G_MAX_RSSI_BOOST);
-	lfr->rssi_penalize_threshold_5g =
-		cfg_get(psoc, CFG_LFR_5G_RSSI_PENALIZE_THRESHOLD);
-	lfr->rssi_penalize_factor_5g =
-		cfg_get(psoc, CFG_LFR_5G_RSSI_PENALIZE_FACTOR);
-	lfr->max_rssi_penalize_5g =
-		cfg_get(psoc, CFG_LFR_5G_MAX_RSSI_PENALIZE);
+
+	if (lfr->enable_5g_band_pref) {
+		lfr->rssi_boost_threshold_5g =
+			cfg_get(psoc, CFG_LFR_5G_RSSI_BOOST_THRESHOLD);
+		lfr->rssi_boost_factor_5g =
+			cfg_get(psoc, CFG_LFR_5G_RSSI_BOOST_FACTOR);
+		lfr->max_rssi_boost_5g =
+			cfg_get(psoc, CFG_LFR_5G_MAX_RSSI_BOOST);
+		lfr->rssi_penalize_threshold_5g =
+			cfg_get(psoc, CFG_LFR_5G_RSSI_PENALIZE_THRESHOLD);
+		lfr->rssi_penalize_factor_5g =
+			cfg_get(psoc, CFG_LFR_5G_RSSI_PENALIZE_FACTOR);
+		lfr->max_rssi_penalize_5g =
+			cfg_get(psoc, CFG_LFR_5G_MAX_RSSI_PENALIZE);
+	}
+
 	lfr->max_num_pre_auth = (uint32_t)
 		cfg_default(CFG_LFR_MAX_NUM_PRE_AUTH);
 	lfr->roam_preauth_no_ack_timeout =

core/hdd/inc/wlan_hdd_cfg.h

@@ -2790,15 +2790,6 @@ struct hdd_config {
 	uint32_t mawc_nlo_init_scan_interval;
 	uint32_t mawc_nlo_max_scan_interval;
 	bool enable_11d_in_world_mode;
-	/* 5G preference parameters for boosting RSSI */
-	bool                        enable_5g_band_pref;
-	int8_t                      rssi_boost_threshold_5g;
-	uint8_t                     rssi_boost_factor_5g;
-	uint8_t                     max_rssi_boost_5g;
-	/* 5G preference parameters for dropping RSSI*/
-	int8_t                      rssi_penalize_threshold_5g;
-	uint8_t                     rssi_penalize_factor_5g;
-	uint8_t                     max_rssi_penalize_5g;
 	bool enable_lprx;
 	uint32_t scan_11d_interval;
 	bool is_bssid_hint_priority;