qcacld-3.0: Remove IBSS related INI and CFG

Remove IBSS related INI and CFG.

Change-Id: Iedebb858448d900bf4909fe5cafc2092baa60285
CRs-Fixed: 2687119

components/mlme/core/inc/wlan_mlme_main.h

@@ -270,16 +270,6 @@ struct wlan_mlme_psoc_ext_obj *mlme_get_psoc_ext_obj_fl(struct wlan_objmgr_psoc
 							const char *func,
 							uint32_t line);
 
-/**
- * mlme_init_ibss_cfg() - Init IBSS config data structure with default CFG value
- * @psoc: pointer to the psoc object
- * @ibss_cfg: Pointer to IBSS cfg data structure to return values
- *
- * Return: QDF_STATUS
- */
-QDF_STATUS mlme_init_ibss_cfg(struct wlan_objmgr_psoc *psoc,
-			      struct wlan_mlme_ibss_cfg *ibss_cfg);
-
 /**
  * mlme_set_self_disconnect_ies() - Set diconnect IEs configured from userspace
  * @vdev: vdev pointer

components/mlme/core/src/wlan_mlme_main.c

@@ -1315,35 +1315,6 @@ static void mlme_init_acs_cfg(struct wlan_objmgr_psoc *psoc,
 	mlme_acs_parse_weight_list(psoc, acs);
 }
 
-QDF_STATUS mlme_init_ibss_cfg(struct wlan_objmgr_psoc *psoc,
-			      struct wlan_mlme_ibss_cfg *ibss_cfg)
-{
-	if (!ibss_cfg)
-		return QDF_STATUS_E_FAILURE;
-
-	ibss_cfg->auto_bssid = cfg_default(CFG_IBSS_AUTO_BSSID);
-	ibss_cfg->atim_win_size = cfg_get(psoc, CFG_IBSS_ATIM_WIN_SIZE);
-	ibss_cfg->adhoc_ch_5g = cfg_get(psoc, CFG_IBSS_ADHOC_CHANNEL_5GHZ);
-	ibss_cfg->adhoc_ch_2g = cfg_get(psoc, CFG_IBSS_ADHOC_CHANNEL_24GHZ);
-	ibss_cfg->coalesing_enable = cfg_get(psoc, CFG_IBSS_COALESING);
-	ibss_cfg->power_save_allow = cfg_get(psoc,
-					     CFG_IBSS_IS_POWER_SAVE_ALLOWED);
-	ibss_cfg->power_collapse_allow =
-			 cfg_get(psoc, CFG_IBSS_IS_POWER_COLLAPSE_ALLOWED);
-	ibss_cfg->awake_on_tx_rx = cfg_get(psoc, CFG_IBSS_AWAKE_ON_TX_RX);
-	ibss_cfg->inactivity_bcon_count =
-			 cfg_get(psoc, CFG_IBSS_INACTIVITY_TIME);
-	ibss_cfg->txsp_end_timeout =
-			 cfg_get(psoc, CFG_IBSS_TXSP_END_INACTIVITY);
-	ibss_cfg->ps_warm_up_time = cfg_get(psoc, CFG_IBSS_PS_WARMUP_TIME);
-	ibss_cfg->ps_1rx_chain_atim_win =
-			 cfg_get(psoc, CFG_IBSS_PS_1RX_CHAIN_IN_ATIM_WINDOW);
-	qdf_copy_macaddr(&ibss_cfg->bssid, (struct qdf_mac_addr *)
-			 &cfg_get(psoc, CFG_IBSS_BSSID));
-
-	return QDF_STATUS_SUCCESS;
-}
-
 static void
 mlme_init_product_details_cfg(struct wlan_mlme_product_details_cfg
 			      *product_details)
@@ -2402,7 +2373,6 @@ QDF_STATUS mlme_cfg_on_psoc_enable(struct wlan_objmgr_psoc *psoc)
 	mlme_init_stats_cfg(psoc, &mlme_cfg->stats);
 	mlme_init_twt_cfg(psoc, &mlme_cfg->twt_cfg);
 	mlme_init_lfr_cfg(psoc, &mlme_cfg->lfr);
-	mlme_init_ibss_cfg(psoc, &mlme_cfg->ibss);
 	mlme_init_feature_flag_in_cfg(psoc, &mlme_cfg->feature_flags);
 	mlme_init_scoring_cfg(psoc, &mlme_cfg->scoring);
 	mlme_init_dot11_mode_cfg(&mlme_cfg->dot11_mode);

components/mlme/dispatcher/inc/cfg_mlme.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2018-2020 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
@@ -26,7 +26,6 @@
 #include "cfg_mlme_chainmask.h"
 #include "cfg_mlme_edca_params.h"
 #include "cfg_mlme_generic.h"
-#include "cfg_mlme_ibss.h"
 #include "cfg_mlme_acs.h"
 #include "cfg_mlme_power.h"
 #include "cfg_mlme_ht_caps.h"
@@ -75,7 +74,6 @@
 	CFG_GENERIC_ALL \
 	CFG_HT_CAPS_ALL \
 	CFG_HE_CAPS_ALL \
-	CFG_IBSS_ALL \
 	CFG_LFR_ALL \
 	CFG_MBO_ALL \
 	CFG_MLME_POWER_ALL \

components/mlme/dispatcher/inc/cfg_mlme_ibss.h

@@ -1,379 +0,0 @@
-/*
- * Copyright (c) 2012-2019 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
- * above copyright notice and this permission notice appear in all
- * copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/**
- * DOC: This file contains centralized definitions of converged configuration.
- */
-
-#ifndef __CFG_MLME_IBSS_H
-#define __CFG_MLME_IBSS_H
-
-/*
- * <ini>
- * g_IBSS_AUTO_BSSID - Control IBSS Auto BSSID setup
- * @Min: 0
- * @Max: 1
- * @Default: 1
- *
- * Control IBSS Auto BSSID enable / disable
- * Usage: External
- *
- * </ini>
- */
-#define CFG_IBSS_AUTO_BSSID CFG_BOOL( \
-			"gIbssAutoBssid", \
-			1, \
-			"Enable Auto BSSID for IBSS")
-
-/*
- * <ini>
- * gAdHocChannel5G - Default 5Ghz IBSS channel if channel freq is not
- * provided by supplicant.
- * @Min: 5180
- * @Max: 5825
- * @Default: 5220
- *
- * This ini is used to set default 5Ghz IBSS channel frequency
- * if channel is not provided by supplicant and band is 5Ghz
- *
- * Related: None
- *
- * Supported Feature: IBSS
- *
- * Usage: Internal/External
- *
- * </ini>
- */
-#define CFG_IBSS_ADHOC_CHANNEL_5GHZ CFG_INI_UINT( \
-		"ad_hoc_ch_freq_5g", \
-		5180, \
-		5825, \
-		5220, \
-		CFG_VALUE_OR_DEFAULT, \
-		"Default 5Ghz IBSS ch freq if not provided by supplicant")
-
-/*
- * <ini>
- * gAdHocChannel24G - Default 2.4Ghz IBSS channel if channel freq is not
- * provided by supplicant.
- * @Min: 2412
- * @Max: 2484
- * @Default: 2437
- *
- * This ini is used to set default 2.4Ghz IBSS channel frequency
- * if channel is not provided by supplicant and band is 2.4Ghz
- *
- * Related: None
- *
- * Supported Feature: IBSS
- *
- * Usage: Internal/External
- *
- * </ini>
- */
-#define CFG_IBSS_ADHOC_CHANNEL_24GHZ CFG_INI_UINT( \
-		"ad_hoc_ch_freq_2g", \
-		2412, \
-		2484, \
-		2437, \
-		CFG_VALUE_OR_DEFAULT, \
-		"Default 2.4Ghz IBSS ch freq if not provided by supplicant")
-
-/*
- * <ini>
- * gCoalesingInIBSS - If IBSS coalesing is enabled.
- * @Min: 0
- * @Max: 1
- * @Default: 0
- *
- * This ini is used to set IBSS coalesing
- *
- * Related: None
- *
- * Supported Feature: IBSS
- *
- * Usage: Internal/External
- *
- * </ini>
- */
-#define CFG_IBSS_COALESING CFG_INI_BOOL( \
-		"gCoalesingInIBSS", \
-		0, \
-		"IBSS coalesing control param")
-
-/*
- * <ini>
- * gIbssATIMWinSize - Set IBSS ATIM window size
- * @Min: 0
- * @Max: 50
- * @Default: 0
- *
- * This ini is used to set IBSS ATIM window size
- *
- * Related: None
- *
- * Supported Feature: IBSS
- *
- * Usage: Internal/External
- *
- * </ini>
- */
-#define CFG_IBSS_ATIM_WIN_SIZE CFG_INI_UINT( \
-		"gIbssATIMWinSize", \
-		0, \
-		50, \
-		0, \
-		CFG_VALUE_OR_DEFAULT, \
-		"Set IBSS ATIM window size")
-
-/*
- * <ini>
- * gIbssIsPowerSaveAllowed - Indicates if IBSS Power Save is
- * supported or not
- * @Min: 0
- * @Max: 1
- * @Default: 1
- *
- * This ini is used to Indicates if IBSS Power Save is
- * supported or not. When not allowed,IBSS station has
- * to stay awake all the time and should never set PM=1
- * in its transmitted frames.
- *
- * Related: valid only when gIbssATIMWinSize is non-zero
- *
- * Supported Feature: IBSS
- *
- * Usage: Internal/External
- *
- * </ini>
- */
-#define CFG_IBSS_IS_POWER_SAVE_ALLOWED CFG_INI_BOOL( \
-		"gIbssIsPowerSaveAllowed", \
-		1, \
-		"IBSS Power Save control")
-
-/*
- * <ini>
- * gIbssIsPowerCollapseAllowed - Indicates if IBSS Power Collapse
- * is allowed
- * @Min: 0
- * @Max: 1
- * @Default: 1
- *
- * This ini is used to indicates if IBSS Power Collapse
- * is allowed
- *
- * Related: None
- *
- * Supported Feature: IBSS
- *
- * Usage: Internal/External
- *
- * </ini>
- */
-#define CFG_IBSS_IS_POWER_COLLAPSE_ALLOWED CFG_INI_BOOL( \
-		"gIbssIsPowerCollapseAllowed", \
-		1, \
-		"Indicates if IBSS Power Collapse is allowed")
-
-/*
- * <ini>
- * gIbssAwakeOnTxRx - Indicates whether IBSS station
- * can exit power save mode and enter power active
- * state whenever there is a TX/RX activity.
- *
- * @Min: 0
- * @Max: 1
- * @Default: 0
- *
- * This ini is used to ndicates whether IBSS station
- * can exit power save mode and enter power active
- * state whenever there is a TX/RX activity.
- *
- * Related: None
- *
- * Supported Feature: IBSS
- *
- * Usage: Internal/External
- *
- * </ini>
- */
-#define CFG_IBSS_AWAKE_ON_TX_RX CFG_INI_BOOL( \
-		"gIbssAwakeOnTxRx", \
-		0, \
-		"IBSS sta power save mode on TX/RX activity")
-
-/*
- * <ini>
- * gIbssInactivityTime - Indicates the data
- * inactivity time in number of beacon intervals
- * after which IBSS station re-inters power save
- *
- * @Min: 1
- * @Max: 10
- * @Default: 1
- *
- * In IBSS mode if Awake on TX/RX activity is enabled
- * Ibss Inactivity parameter indicates the data
- * inactivity time in number of beacon intervals
- * after which IBSS station re-inters power save
- * by sending Null frame with PM=1
- *
- * Related: Aplicable if gIbssAwakeOnTxRx is enabled
- *
- * Supported Feature: IBSS
- *
- * Usage: Internal/External
- *
- * </ini>
- */
-#define CFG_IBSS_INACTIVITY_TIME CFG_INI_UINT( \
-		"gIbssInactivityTime", \
-		1, \
-		10, \
-		1, \
-		CFG_VALUE_OR_DEFAULT, \
-		"No of Beacons intervals of data inactivity for power save")
-
-/*
- * <ini>
- * gIbssTxSpEndInactivityTime - Indicates the time after
- * which TX Service Period is terminated by
- * sending a Qos Null frame with EOSP.
- *
- * @Min: 0
- * @Max: 100
- * @Default: 0
- *
- * In IBSS mode Tx Service Period Inactivity
- * time in msecs indicates the time after
- * which TX Service Period is terminated by
- * sending a Qos Null frame with EOSP.
- * If value is 0, TX SP is terminated with the
- * last buffered packet itself instead of waiting
- * for the inactivity.
- *
- * Related: None
- *
- * Supported Feature: IBSS
- *
- * Usage: Internal/External
- *
- * </ini>
- */
-#define CFG_IBSS_TXSP_END_INACTIVITY CFG_INI_UINT( \
-		"gIbssTxSpEndInactivityTime", \
-		0, \
-		100, \
-		0, \
-		CFG_VALUE_OR_DEFAULT, \
-		"TX service period inactivity timeout")
-
-/*
- * <ini>
- * gIbssPsWarmupTime - PS-supporting device
- * does not enter protocol sleep state during first
- * gIbssPsWarmupTime seconds.
- *
- * @Min: 0
- * @Max: 65535
- * @Default: 0
- *
- * When IBSS network is initialized, PS-supporting device
- * does not enter protocol sleep state during first
- * gIbssPsWarmupTime seconds.
- *
- * Related: valid if gIbssIsPowerSaveAllowed is set
- *
- * Supported Feature: IBSS
- *
- * Usage: Internal/External
- *
- * </ini>
- */
-#define CFG_IBSS_PS_WARMUP_TIME CFG_INI_UINT( \
-		"gIbssPsWarmupTime", \
-		0, \
-		65535, \
-		0, \
-		CFG_VALUE_OR_DEFAULT, \
-		"IBSS Power save skip time")
-
-/*
- * <ini>
- * gIbssPs1RxChainInAtim - IBSS Power Save Enable/Disable 1 RX
- * chain usage during the ATIM window
- *
- * @Min: 0
- * @Max: 1
- * @Default: 0
- *
- * IBSS Power Save Enable/Disable 1 RX
- * chain usage during the ATIM window
- *
- * Related: Depend on gIbssIsPowerSaveAllowed
- *
- * Supported Feature: IBSS
- *
- * Usage: Internal/External
- *
- * </ini>
- */
-#define CFG_IBSS_PS_1RX_CHAIN_IN_ATIM_WINDOW CFG_INI_BOOL( \
-		"gIbssPs1RxChainInAtim", \
-		0, \
-		"Control IBSS Power save in 1RX chain during ATIM")
-
-/*
- * <ini>
- * gIbssBssid - Default IBSS BSSID if BSSID is not provided by supplicant
- * @Min: "000000000000"
- * @Max: "ffffffffffff"
- * @Default: "000AF5040506"
- *
- * This ini is used to set Default IBSS BSSID if BSSID
- * is not provided by supplicant and Coalesing is disabled
- *
- * Related: Only applicable if gCoalesingInIBSS is 0
- *
- * Supported Feature: IBSS
- *
- * Usage: Internal/External
- *
- * </ini>
- */
-#define IBSS_BSSID_DEFAULT { .bytes = { 0x00, 0x0a, 0xf5, 0x04, 0x05, 0x06 } }
-#define CFG_IBSS_BSSID CFG_INI_MAC("gIbssBssid", \
-		IBSS_BSSID_DEFAULT, \
-		"IBSS BSSID if not provided by supplicant")
-
-#define CFG_IBSS_ALL \
-	CFG(CFG_IBSS_ADHOC_CHANNEL_5GHZ) \
-	CFG(CFG_IBSS_ADHOC_CHANNEL_24GHZ) \
-	CFG(CFG_IBSS_ATIM_WIN_SIZE) \
-	CFG(CFG_IBSS_AUTO_BSSID) \
-	CFG(CFG_IBSS_AWAKE_ON_TX_RX) \
-	CFG(CFG_IBSS_BSSID) \
-	CFG(CFG_IBSS_COALESING) \
-	CFG(CFG_IBSS_INACTIVITY_TIME) \
-	CFG(CFG_IBSS_IS_POWER_COLLAPSE_ALLOWED) \
-	CFG(CFG_IBSS_IS_POWER_SAVE_ALLOWED) \
-	CFG(CFG_IBSS_PS_1RX_CHAIN_IN_ATIM_WINDOW) \
-	CFG(CFG_IBSS_PS_WARMUP_TIME) \
-	CFG(CFG_IBSS_TXSP_END_INACTIVITY)
-#endif

components/mlme/dispatcher/inc/wlan_mlme_public_struct.h

@@ -2231,38 +2231,6 @@ struct wlan_mlme_reg {
 	bool enable_pending_chan_list_req;
 };
 
-/**
- * struct wlan_mlme_ibss_cfg - IBSS config params
- * @auto_bssid: Enable Auto BSSID for IBSS
- * @atim_win_size: Set IBSS ATIM window size
- * @adhoc_ch_5g: Default 5Ghz IBSS channel if not provided by supplicant
- * @adhoc_ch_2g: Default 2.4Ghz IBSS channel if not provided by supplicant
- * @coalesing_enable: IBSS coalesing control param
- * @power_save_allow: IBSS Power Save control
- * @power_collapse_allow: IBSS Power collapse control
- * @awake_on_tx_rx: IBSS sta power save mode on TX/RX activity
- * @inactivity_bcon_count: No of Beacons of data inactivity for power save
- * @txsp_end_timeout: TX service period inactivity timeout
- * @ps_warm_up_time: IBSS Power save skip time
- * @ps_1rx_chain_atim_win: Control IBSS Power save in 1RX chain during ATIM
- * @bssid: BSSID Mac address: IBSS BSSID if not provided by supplicant
- */
-struct wlan_mlme_ibss_cfg {
-	bool auto_bssid;
-	uint32_t atim_win_size;
-	uint32_t adhoc_ch_5g;
-	uint32_t adhoc_ch_2g;
-	bool coalesing_enable;
-	bool power_save_allow;
-	bool power_collapse_allow;
-	bool awake_on_tx_rx;
-	uint32_t inactivity_bcon_count;
-	uint32_t txsp_end_timeout;
-	uint32_t ps_warm_up_time;
-	uint32_t ps_1rx_chain_atim_win;
-	struct qdf_mac_addr bssid;
-};
-
 /**
  * struct wlan_mlme_cfg - MLME config items
  * @chainmask_cfg: VHT chainmask related cfg items
@@ -2316,7 +2284,6 @@ struct wlan_mlme_cfg {
 	struct wlan_mlme_he_caps he_caps;
 #endif
 	struct wlan_mlme_lfr_cfg lfr;
-	struct wlan_mlme_ibss_cfg ibss;
 	struct wlan_mlme_obss_ht40 obss_ht40;
 	struct wlan_mlme_mbo mbo_cfg;
 	struct wlan_mlme_vht_caps vht_caps;

components/mlme/dispatcher/inc/wlan_mlme_ucfg_api.h

@@ -2820,26 +2820,6 @@ ucfg_mlme_stats_is_link_speed_report_max(struct wlan_objmgr_psoc *psoc);
 bool
 ucfg_mlme_stats_is_link_speed_report_max_scaled(struct wlan_objmgr_psoc *psoc);
 
-/**
- * ucfg_mlme_get_ibss_cfg() - Get IBSS config params data structure
- * @psoc: pointer to psoc object
- * @auto_bssid: Pointer to return the IBSS config data structure
- *
- * Return: QDF Status
- */
-QDF_STATUS ucfg_mlme_get_ibss_cfg(struct wlan_objmgr_psoc *psoc,
-				  struct wlan_mlme_ibss_cfg *ibss_cfg);
-
-/**
- * ucfg_mlme_set_ibss_auto_bssid() - Set IBSS Auto BSSID config
- * @psoc: pointer to psoc object
- * @auto_bssid: IBSS Auto BSSID config value
- *
- * Return: QDF Status
- */
-QDF_STATUS ucfg_mlme_set_ibss_auto_bssid(struct wlan_objmgr_psoc *psoc,
-					 uint32_t auto_bssid);
-
 /**
  * ucfg_mlme_get_tl_delayed_trgr_frm_int() - Get delay interval(in ms)
  * of UAPSD auto trigger.

components/mlme/dispatcher/src/wlan_mlme_ucfg_api.c

@@ -1430,38 +1430,6 @@ ucfg_mlme_get_latency_enable(struct wlan_objmgr_psoc *psoc, bool *value)
 	return QDF_STATUS_SUCCESS;
 }
 
-QDF_STATUS ucfg_mlme_get_ibss_cfg(struct wlan_objmgr_psoc *psoc,
-				  struct wlan_mlme_ibss_cfg *ibss_cfg)
-{
-	struct wlan_mlme_psoc_ext_obj *mlme_obj;
-
-	if (!ibss_cfg)
-		return QDF_STATUS_E_FAILURE;
-
-	mlme_obj = mlme_get_psoc_ext_obj(psoc);
-	if (!mlme_obj) {
-		mlme_legacy_err("MLME Obj null on get IBSS config");
-		mlme_init_ibss_cfg(psoc, ibss_cfg);
-		return QDF_STATUS_E_INVAL;
-	}
-	*ibss_cfg = mlme_obj->cfg.ibss;
-	return QDF_STATUS_SUCCESS;
-}
-
-QDF_STATUS ucfg_mlme_set_ibss_auto_bssid(struct wlan_objmgr_psoc *psoc,
-					 uint32_t auto_bssid)
-{
-	struct wlan_mlme_psoc_ext_obj *mlme_obj;
-
-	mlme_obj = mlme_get_psoc_ext_obj(psoc);
-	if (!mlme_obj) {
-		mlme_legacy_err("MLME Obj null on get IBSS config");
-		return QDF_STATUS_E_INVAL;
-	}
-	mlme_obj->cfg.ibss.auto_bssid = auto_bssid;
-	return QDF_STATUS_SUCCESS;
-}
-
 #ifdef MWS_COEX
 QDF_STATUS
 ucfg_mlme_get_mws_coex_4g_quick_tdm(struct wlan_objmgr_psoc *psoc,

core/hdd/src/wlan_hdd_cfg.c

@@ -832,16 +832,8 @@ QDF_STATUS hdd_set_sme_config(struct hdd_context *hdd_ctx)
 #ifdef FEATURE_WLAN_ESE
 	bool ese_enabled;
 #endif
-	struct wlan_mlme_ibss_cfg ibss_cfg = {0};
-
 	struct hdd_config *config = hdd_ctx->config;
 
-	if (QDF_IS_STATUS_ERROR(ucfg_mlme_get_ibss_cfg(
-				hdd_ctx->psoc, &ibss_cfg))) {
-		hdd_err("Unable to get IBSS config params");
-		return QDF_STATUS_E_FAILURE;
-	}
-
 	sme_config = qdf_mem_malloc(sizeof(*sme_config));
 	if (!sme_config) {
 		hdd_err("unable to allocate sme_config");
@@ -876,8 +868,6 @@ QDF_STATUS hdd_set_sme_config(struct hdd_context *hdd_ctx)
 	 */
 	/* This param cannot be configured from INI */
 	sme_config->csr_config.send_smps_action = true;
-	sme_config->csr_config.ad_hoc_ch_freq_5g = ibss_cfg.adhoc_ch_5g;
-	sme_config->csr_config.ad_hoc_ch_freq_2g = ibss_cfg.adhoc_ch_2g;
 	sme_config->csr_config.ProprietaryRatesEnabled = 0;
 	sme_config->csr_config.HeartbeatThresh50 = 40;
 	ucfg_scan_cfg_get_dfs_chan_scan_allowed(hdd_ctx->psoc,

core/sme/inc/csr_api.h

@@ -853,8 +853,6 @@ struct csr_config_params {
 	eCsrRoamWmmUserModeType WMMSupportMode;
 	bool Is11eSupportEnabled;
 	bool ProprietaryRatesEnabled;
-	uint32_t ad_hoc_ch_freq_5g;
-	uint32_t ad_hoc_ch_freq_2g;
 	/*
 	 * this number minus one is the number of times a scan doesn't find it
 	 * before it is removed

core/sme/inc/csr_internal.h

@@ -341,8 +341,6 @@ struct csr_config {
 	bool mcc_rts_cts_prot_enable;
 	bool mcc_bcast_prob_resp_enable;
 	uint8_t fAllowMCCGODiffBI;
-	uint32_t ad_hoc_ch_freq_2g;
-	uint32_t ad_hoc_ch_freq_5g;
 	uint8_t bCatRssiOffset; /* to set RSSI difference for each category */
 	bool nRoamScanControl;
 

core/sme/src/csr/csr_api_roam.c

@@ -2553,10 +2553,6 @@ QDF_STATUS csr_change_default_config_param(struct mac_context *mac,
 			pParam->HeartbeatThresh50;
 		mac->roam.configParam.ProprietaryRatesEnabled =
 			pParam->ProprietaryRatesEnabled;
-		mac->roam.configParam.ad_hoc_ch_freq_5g =
-						pParam->ad_hoc_ch_freq_5g;
-		mac->roam.configParam.ad_hoc_ch_freq_2g =
-						pParam->ad_hoc_ch_freq_2g;
 
 		mac->roam.configParam.wep_tkip_in_he = pParam->wep_tkip_in_he;
 
@@ -2682,8 +2678,6 @@ QDF_STATUS csr_get_config_param(struct mac_context *mac,
 	pParam->phyMode = cfg_params->phyMode;
 	pParam->HeartbeatThresh50 = cfg_params->HeartbeatThresh50;
 	pParam->ProprietaryRatesEnabled = cfg_params->ProprietaryRatesEnabled;
-	pParam->ad_hoc_ch_freq_5g = cfg_params->ad_hoc_ch_freq_5g;
-	pParam->ad_hoc_ch_freq_2g = cfg_params->ad_hoc_ch_freq_2g;
 	pParam->bCatRssiOffset = cfg_params->bCatRssiOffset;
 	pParam->fEnableDFSChnlScan = mac->scan.fEnableDFSChnlScan;
 	pParam->fEnableMCCMode = cfg_params->fenableMCCMode;