qcacld-3.0: Remove relaxed_6ghz_conn_policy cfg item

relaxed_6ghz_conn_policy cfg item is no longer needed
with new regulatory policy as there is no dependency
on STA, AP country code to find 6 GHz power mode for
connection and also connect request should be rejected
if AP is advertising VLP and STA doesn't support VLP.

Hence remove this cfg item and the related APIs.

Change-Id: I3a48a3c6343e57f4f2386ebbab1f88d5052af505
CRs-Fixed: 3470571

components/mlme/core/src/wlan_mlme_main.c

@@ -718,21 +718,6 @@ static void mlme_init_wds_config_cfg(struct wlan_objmgr_psoc *psoc,
 #endif
 
 #ifdef CONFIG_BAND_6GHZ
-/**
- * mlme_init_relaxed_6ghz_conn_policy() - initialize relaxed 6GHz
- *                                        policy connection flag
- * @psoc: Pointer to PSOC
- * @gen: pointer to generic CFG items
- *
- * Return: None
- */
-static void mlme_init_relaxed_6ghz_conn_policy(struct wlan_objmgr_psoc *psoc,
-					       struct wlan_mlme_generic *gen)
-{
-	gen->relaxed_6ghz_conn_policy =
-		cfg_default(CFG_RELAXED_6GHZ_CONN_POLICY);
-}
-
 /**
  * mlme_init_standard_6ghz_conn_policy() - initialize standard 6GHz
  *                                         policy connection flag
@@ -748,11 +733,6 @@ static void mlme_init_standard_6ghz_conn_policy(struct wlan_objmgr_psoc *psoc,
 		cfg_get(psoc, CFG_6GHZ_STANDARD_CONNECTION_POLICY);
 }
 #else
-static void mlme_init_relaxed_6ghz_conn_policy(struct wlan_objmgr_psoc *psoc,
-					       struct wlan_mlme_generic *gen)
-{
-}
-
 static void mlme_init_standard_6ghz_conn_policy(struct wlan_objmgr_psoc *psoc,
 						struct wlan_mlme_generic *gen)
 {
@@ -926,7 +906,6 @@ static void mlme_init_generic_cfg(struct wlan_objmgr_psoc *psoc,
 	mlme_init_sr_ini_cfg(psoc, gen);
 	mlme_init_wds_config_cfg(psoc, gen);
 	mlme_init_mgmt_hw_tx_retry_count_cfg(psoc, gen);
-	mlme_init_relaxed_6ghz_conn_policy(psoc, gen);
 	mlme_init_emlsr_mode(psoc, gen);
 	mlme_init_tl2m_negotiation_support(psoc, gen);
 	mlme_init_standard_6ghz_conn_policy(psoc, gen);

components/mlme/dispatcher/inc/cfg_mlme_generic.h

@@ -267,30 +267,6 @@ enum t2lm_negotiation_support {
 #define CFG_6GHZ_STD_CONN_POLICY
 #endif
 
-#ifdef CONFIG_BAND_6GHZ
-/*
- * relaxed_6ghz_conn_policy - Enable 6ghz relaxed connection policy
- * @Min: 0
- * @Max: 1
- * @Default: 0
- *
- * This cfg is used to set 6Ghz relaxed connection policies where STA
- * will be allowed to operate in VLP mode and scan/connect to 6 GHz BSS
- * with unmatching country code.
- *
- * Related: None
- *
- * Supported Feature: STA
- */
-#define CFG_RELAXED_6GHZ_CONN_POLICY CFG_BOOL( \
-		"relaxed_6ghz_conn_policy", \
-		0, \
-		"6ghz relaxed connection policy")
-#define CFG_RELAX_6GHZ_CONN_POLICY	CFG(CFG_RELAXED_6GHZ_CONN_POLICY)
-#else
-#define CFG_RELAX_6GHZ_CONN_POLICY
-#endif
-
 #ifdef WLAN_FEATURE_11BE_MLO
 /*
  * emlsr_mode_enable - Enable eMLSR mode support
@@ -1196,7 +1172,6 @@ enum t2lm_negotiation_support {
 	CFG_WDS_MODE_ALL \
 	CFG(CFG_TX_RETRY_MULTIPLIER) \
 	CFG(CFG_MGMT_FRAME_HW_TX_RETRY_COUNT) \
-	CFG_RELAX_6GHZ_CONN_POLICY \
 	CFG_6GHZ_STD_CONN_POLICY \
 	CFG_EMLSR_MODE_ENABLED \
 	CFG_SR_ENABLE_MODES_ALL \

components/mlme/dispatcher/inc/wlan_mlme_api.h

@@ -2489,29 +2489,6 @@ QDF_STATUS
 wlan_mlme_is_standard_6ghz_conn_policy_enabled(struct wlan_objmgr_psoc *psoc,
 					       bool *value);
 
-/**
- * wlan_mlme_is_relaxed_6ghz_conn_policy_enabled() - Get the 6 GHz relaxed
- *                                                   connection policy flag
- * @psoc: psoc context
- * @value: Enable/Disable value ptr.
- *
- * Return: QDF_STATUS
- */
-QDF_STATUS
-wlan_mlme_is_relaxed_6ghz_conn_policy_enabled(struct wlan_objmgr_psoc *psoc,
-					      bool *value);
-
-/**
- * wlan_mlme_set_relaxed_6ghz_conn_policy() - Set the 6 GHz relaxed
- *                                            connection policy flag
- * @psoc: psoc context
- * @value: True/False
- *
- * Return: QDF_STATUS
- */
-QDF_STATUS
-wlan_mlme_set_relaxed_6ghz_conn_policy(struct wlan_objmgr_psoc *psoc,
-				       bool value);
 #else
 static inline QDF_STATUS
 wlan_mlme_is_standard_6ghz_conn_policy_enabled(struct wlan_objmgr_psoc *psoc,
@@ -2520,21 +2497,6 @@ wlan_mlme_is_standard_6ghz_conn_policy_enabled(struct wlan_objmgr_psoc *psoc,
 	*value = false;
 	return QDF_STATUS_SUCCESS;
 }
-
-static inline QDF_STATUS
-wlan_mlme_is_relaxed_6ghz_conn_policy_enabled(struct wlan_objmgr_psoc *psoc,
-					      bool *value)
-{
-	*value = false;
-	return QDF_STATUS_SUCCESS;
-}
-
-static inline QDF_STATUS
-wlan_mlme_set_relaxed_6ghz_conn_policy(struct wlan_objmgr_psoc *psoc,
-				       bool value)
-{
-	return QDF_STATUS_SUCCESS;
-}
 #endif
 
 #ifdef WLAN_FEATURE_11BE_MLO

components/mlme/dispatcher/inc/wlan_mlme_public_struct.h

@@ -1388,7 +1388,6 @@ struct wlan_user_mcc_quota {
  * @dual_sta_policy_cfg: Dual STA policies configuration
  * @tx_retry_multiplier: TX xretry extension parameter
  * @mgmt_hw_tx_retry_count: MGMT HW tx retry count for frames
- * @relaxed_6ghz_conn_policy: 6GHz relaxed connection policy
  * @std_6ghz_conn_policy: 6GHz standard connection policy
  * @eht_mode: EHT mode of operation
  * @t2lm_negotiation_support: T2LM negotiation supported enum value
@@ -1445,7 +1444,6 @@ struct wlan_mlme_generic {
 	uint32_t tx_retry_multiplier;
 	uint8_t mgmt_hw_tx_retry_count[CFG_FRAME_TYPE_MAX];
 #ifdef CONFIG_BAND_6GHZ
-	bool relaxed_6ghz_conn_policy;
 	bool std_6ghz_conn_policy;
 #endif
 #ifdef WLAN_FEATURE_11BE_MLO

components/mlme/dispatcher/inc/wlan_mlme_ucfg_api.h

@@ -2899,23 +2899,6 @@ ucfg_mlme_set_rf_test_mode_enabled(struct wlan_objmgr_psoc *psoc, bool value)
 	return wlan_mlme_set_rf_test_mode_enabled(psoc, value);
 }
 
-/**
- * ucfg_mlme_is_relaxed_6ghz_conn_policy_enabled() - Get 6ghz relaxed
- *                                                   connection policy flag
- * @psoc: pointer to psoc object
- * @value: pointer to hold the value of flag
- *
- * Inline UCFG API to be used by HDD/OSIF callers
- *
- * Return: QDF Status
- */
-static inline QDF_STATUS
-ucfg_mlme_is_relaxed_6ghz_conn_policy_enabled(struct wlan_objmgr_psoc *psoc,
-					      bool *value)
-{
-	return wlan_mlme_is_relaxed_6ghz_conn_policy_enabled(psoc, value);
-}
-
 /**
  * ucfg_mlme_is_standard_6ghz_conn_policy_enabled() - Get 6ghz standard
  *                                                    connection policy flag
@@ -2933,23 +2916,6 @@ ucfg_mlme_is_standard_6ghz_conn_policy_enabled(struct wlan_objmgr_psoc *psoc,
 	return wlan_mlme_is_standard_6ghz_conn_policy_enabled(psoc, value);
 }
 
-/**
- * ucfg_mlme_set_relaxed_6ghz_conn_policy() - Set 6ghz relaxed
- *                                            connection policy flag
- * @psoc: pointer to psoc object
- * @value: Value that needs to be set
- *
- * Inline UCFG API to be used by HDD/OSIF callers
- *
- * Return: QDF Status
- */
-static inline QDF_STATUS
-ucfg_mlme_set_relaxed_6ghz_conn_policy(struct wlan_objmgr_psoc *psoc,
-				       bool value)
-{
-	return wlan_mlme_set_relaxed_6ghz_conn_policy(psoc, value);
-}
-
 /**
  * ucfg_mlme_set_eht_mode() - Set EHT mode of operation
  * @psoc: pointer to psoc object

components/mlme/dispatcher/src/wlan_mlme_api.c

@@ -3374,36 +3374,6 @@ wlan_mlme_is_standard_6ghz_conn_policy_enabled(struct wlan_objmgr_psoc *psoc,
 
 	return QDF_STATUS_SUCCESS;
 }
-
-QDF_STATUS
-wlan_mlme_is_relaxed_6ghz_conn_policy_enabled(struct wlan_objmgr_psoc *psoc,
-					      bool *value)
-{
-	struct wlan_mlme_psoc_ext_obj *mlme_obj;
-
-	mlme_obj = mlme_get_psoc_ext_obj(psoc);
-	if (!mlme_obj)
-		return QDF_STATUS_E_FAILURE;
-
-	*value = mlme_obj->cfg.gen.relaxed_6ghz_conn_policy;
-
-	return QDF_STATUS_SUCCESS;
-}
-
-QDF_STATUS
-wlan_mlme_set_relaxed_6ghz_conn_policy(struct wlan_objmgr_psoc *psoc,
-				       bool value)
-{
-	struct wlan_mlme_psoc_ext_obj *mlme_obj;
-
-	mlme_obj = mlme_get_psoc_ext_obj(psoc);
-	if (!mlme_obj)
-		return QDF_STATUS_E_FAILURE;
-
-	mlme_obj->cfg.gen.relaxed_6ghz_conn_policy = value;
-
-	return QDF_STATUS_SUCCESS;
-}
 #endif
 
 #ifdef WLAN_FEATURE_11BE_MLO

core/hdd/src/wlan_hdd_main.c

@@ -14828,7 +14828,6 @@ static int hdd_features_init(struct hdd_context *hdd_ctx)
 	mac_handle_t mac_handle;
 	bool b_cts2self, is_imps_enabled;
 	bool rf_test_mode;
-	bool conn_policy;
 	bool std_6ghz_conn_policy;
 	uint32_t fw_data_stall_evt;
 
@@ -14927,15 +14926,6 @@ static int hdd_features_init(struct hdd_context *hdd_ctx)
 					       DEFAULT_KEYMGMT_6G_MASK);
 	}
 
-	status = ucfg_mlme_is_relaxed_6ghz_conn_policy_enabled(hdd_ctx->psoc,
-							       &conn_policy);
-	if (!QDF_IS_STATUS_SUCCESS(status)) {
-		hdd_err("Get 6ghz relaxed connection policy failed");
-		return QDF_STATUS_E_FAILURE;
-	}
-	if (conn_policy)
-		wlan_cm_set_relaxed_6ghz_conn_policy(hdd_ctx->psoc, true);
-
 	status = ucfg_mlme_is_standard_6ghz_conn_policy_enabled(hdd_ctx->psoc,
 							&std_6ghz_conn_policy);