qcacld-3.0: Deprecate the ini gEnableOverLapCh

Deprecate the ini gEnableOverLapCh as it is no
longer in use.

Change-Id: I79b0a2789409964c1ce56641fecdf3ae3ec4e053
CRs-Fixed: 2903153

components/cmn_services/policy_mgr/inc/wlan_policy_mgr_api.h

@@ -134,19 +134,6 @@ enum PM_AP_DFS_MASTER_MODE {
 QDF_STATUS
 policy_mgr_get_allow_mcc_go_diff_bi(struct wlan_objmgr_psoc *psoc,
 				    uint8_t *allow_mcc_go_diff_bi);
-/**
- * policy_mgr_get_enable_overlap_chnl() - to find out if overlap channels
- *					  are enabled for SAP
- * @psoc: pointer to psoc
- * @enable_overlap_chnl: value to be filled
- *
- * This API is used to find out whether overlap channels are enabled for SAP
- *
- * Return: QDF_STATUS_SUCCESS up on success and any other status for failure.
- */
-QDF_STATUS
-policy_mgr_get_enable_overlap_chnl(struct wlan_objmgr_psoc *psoc,
-				   uint8_t *enable_overlap_chnl);
 /**
  * policy_mgr_get_dual_mac_feature() - to find out if DUAL MAC feature is
  *				       enabled

components/cmn_services/policy_mgr/inc/wlan_policy_mgr_cfg.h

@@ -326,29 +326,6 @@
 CFG_INI_UINT("gAllowMCCGODiffBI", 0, 4, 4, CFG_VALUE_OR_DEFAULT, \
 	     "Allow GO in MCC mode to accept different BI than STA's")
 
-/*
- * <ini>
- * gEnableOverLapCh - Enables Overlap Channel. If set, allow overlapping
- *                    channels to be selected for the SoftAP
- * @Min: 0
- * @Max: 1
- * @Default: 0
- *
- * This ini is used to set Overlap Channel
- *
- * Related: None
- *
- * Supported Feature: STA
- *
- * Usage: External
- *
- * </ini>
- */
-
-#define CFG_ENABLE_OVERLAP_CH \
-CFG_INI_UINT("gEnableOverLapCh", 0, 1, 0, CFG_VALUE_OR_DEFAULT, \
-	     "Overlap channels are allowed for SAP when flag is set")
-
 /*
  *
  * <ini>
@@ -603,7 +580,6 @@ CFG_INI_UINT("g_pcl_band_priority", 0, 1, 0, CFG_VALUE_OR_DEFAULT, \
 		CFG(CFG_ENABLE_CONC_RULE2) \
 		CFG(CFG_ENABLE_MCC_ADAPTIVE_SCH_ENABLED_NAME)\
 		CFG(CFG_ENABLE_STA_CONNECTION_IN_5GHZ)\
-		CFG(CFG_ENABLE_OVERLAP_CH)\
 		CFG(CFG_DUAL_MAC_FEATURE_DISABLE)\
 		CFG(CFG_STA_SAP_SCC_ON_DFS_CHAN)\
 		CFG(CFG_FORCE_1X1_FEATURE)\

components/cmn_services/policy_mgr/inc/wlan_policy_mgr_ucfg.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -189,19 +189,6 @@ QDF_STATUS ucfg_policy_mgr_get_sta_cxn_5g_band(struct wlan_objmgr_psoc *psoc,
 QDF_STATUS
 ucfg_policy_mgr_get_allow_mcc_go_diff_bi(struct wlan_objmgr_psoc *psoc,
 					 uint8_t *allow_mcc_go_diff_bi);
-/**
- * ucfg_policy_mgr_get_enable_overlap_chnl() - to find out if overlap channels
- *						are enabled for SAP
- * @psoc: pointer to psoc
- * @enable_overlap_chnl: value to be filled
- *
- * This API is used to find out whether overlap channels are enabled for SAP
- *
- * Return: QDF_STATUS_SUCCESS up on success and any other status for failure.
- */
-QDF_STATUS
-ucfg_policy_mgr_get_enable_overlap_chnl(struct wlan_objmgr_psoc *psoc,
-					uint8_t *enable_overlap_chnl);
 /**
  * ucfg_policy_mgr_get_dual_mac_feature() - to find out if DUAL MAC feature is
  *					    enabled

components/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c

@@ -86,22 +86,6 @@ policy_mgr_get_allow_mcc_go_diff_bi(struct wlan_objmgr_psoc *psoc,
 	return QDF_STATUS_SUCCESS;
 }
 
-QDF_STATUS
-policy_mgr_get_enable_overlap_chnl(struct wlan_objmgr_psoc *psoc,
-				   uint8_t *enable_overlap_chnl)
-{
-	struct policy_mgr_psoc_priv_obj *pm_ctx;
-
-	pm_ctx = policy_mgr_get_context(psoc);
-	if (!pm_ctx) {
-		policy_mgr_err("pm_ctx is NULL");
-		return QDF_STATUS_E_FAILURE;
-	}
-	*enable_overlap_chnl = pm_ctx->cfg.enable_overlap_chnl;
-
-	return QDF_STATUS_SUCCESS;
-}
-
 QDF_STATUS policy_mgr_set_dual_mac_feature(struct wlan_objmgr_psoc *psoc,
 					   uint8_t dual_mac_feature)
 {

components/cmn_services/policy_mgr/src/wlan_policy_mgr_i.h

@@ -235,7 +235,6 @@ extern enum policy_mgr_conc_next_action
  * @conc_rule1: concurrency rule1
  * @conc_rule2: concurrency rule2
  * @allow_mcc_go_diff_bi: Allow GO and STA diff beacon interval in MCC
- * @enable_overlap_chnl: Enable overlap channels for SAP's channel selection
  * @dual_mac_feature: To enable/disable dual mac features
  * @is_force_1x1_enable: Is 1x1 forced for connection
  * @sta_sap_scc_on_dfs_chnl: STA-SAP SCC on DFS channel
@@ -259,7 +258,6 @@ struct policy_mgr_cfg {
 	uint8_t conc_rule2;
 	bool enable_mcc_adaptive_sch;
 	uint8_t allow_mcc_go_diff_bi;
-	uint8_t enable_overlap_chnl;
 	uint8_t dual_mac_feature;
 	enum force_1x1_type is_force_1x1_enable;
 	uint8_t sta_sap_scc_on_dfs_chnl;

components/cmn_services/policy_mgr/src/wlan_policy_mgr_ucfg.c

@@ -47,8 +47,6 @@ static QDF_STATUS policy_mgr_init_cfg(struct wlan_objmgr_psoc *psoc)
 		cfg_get(psoc, CFG_ENABLE_STA_CONNECTION_IN_5GHZ);
 	cfg->allow_mcc_go_diff_bi =
 		cfg_get(psoc, CFG_ALLOW_MCC_GO_DIFF_BI);
-	cfg->enable_overlap_chnl =
-		cfg_get(psoc, CFG_ENABLE_OVERLAP_CH);
 	cfg->dual_mac_feature =
 		cfg_get(psoc, CFG_DUAL_MAC_FEATURE_DISABLE);
 	cfg->is_force_1x1_enable =
@@ -188,13 +186,6 @@ ucfg_policy_mgr_get_allow_mcc_go_diff_bi(struct wlan_objmgr_psoc *psoc,
 	return policy_mgr_get_allow_mcc_go_diff_bi(psoc, allow_mcc_go_diff_bi);
 }
 
-QDF_STATUS
-ucfg_policy_mgr_get_enable_overlap_chnl(struct wlan_objmgr_psoc *psoc,
-					uint8_t *enable_overlap_chnl)
-{
-	return policy_mgr_get_enable_overlap_chnl(psoc, enable_overlap_chnl);
-}
-
 QDF_STATUS ucfg_policy_mgr_get_dual_mac_feature(struct wlan_objmgr_psoc *psoc,
 						uint8_t *dual_mac_feature)
 {

core/hdd/src/wlan_hdd_hostapd.c

@@ -4640,19 +4640,11 @@ QDF_STATUS wlan_hdd_config_acs(struct hdd_context *hdd_ctx,
 	struct sap_config *sap_config;
 	struct hdd_config *ini_config;
 	mac_handle_t mac_handle;
-	uint8_t is_overlap_enable = 0;
-	QDF_STATUS status;
 
 	mac_handle = hdd_ctx->mac_handle;
 	sap_config = &adapter->session.ap.sap_config;
 	ini_config = hdd_ctx->config;
 
-	status = ucfg_policy_mgr_get_enable_overlap_chnl(hdd_ctx->psoc,
-							 &is_overlap_enable);
-	if (status != QDF_STATUS_SUCCESS)
-		hdd_err("can't get overlap channel INI value, using default");
-	sap_config->enOverLapCh = !!is_overlap_enable;
-
 #ifdef FEATURE_WLAN_AP_AP_ACS_OPTIMIZE
 	hdd_debug("HDD_ACS_SKIP_STATUS = %d", hdd_ctx->skip_acs_scan_status);
 	if (hdd_ctx->skip_acs_scan_status == eSAP_SKIP_ACS_SCAN) {
@@ -5308,7 +5300,6 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
 	uint16_t prev_rsn_length = 0;
 	enum dfs_mode mode;
 	bool ignore_cac = 0;
-	uint8_t is_overlap_enable = 0;
 	uint8_t beacon_fixed_len, indoor_chnl_marking = 0;
 	bool sap_force_11n_for_11ac = 0;
 	bool go_force_11n_for_11ac = 0;
@@ -5424,13 +5415,6 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
 
 	config->beacon_int = mgmt_frame->u.beacon.beacon_int;
 	config->dfs_cac_offload = hdd_ctx->dfs_cac_offload;
-
-	status = ucfg_policy_mgr_get_enable_overlap_chnl(hdd_ctx->psoc,
-							 &is_overlap_enable);
-	if (!QDF_IS_STATUS_SUCCESS(status))
-		hdd_err("can't get overlap channel INI value, using default");
-	config->enOverLapCh = is_overlap_enable;
-
 	config->dtim_period = beacon->dtim_period;
 
 	if (config->acs_cfg.acs_mode == true) {