diff --git a/components/mlme/core/inc/wlan_mlme_main.h b/components/mlme/core/inc/wlan_mlme_main.h
index 569359e138..16425739fa 100644
--- a/components/mlme/core/inc/wlan_mlme_main.h
+++ b/components/mlme/core/inc/wlan_mlme_main.h
@@ -33,19 +33,6 @@
#define MAC_MAX_ADD_IE_LENGTH 2048
-/* The ini etsi13_srd_chan_in_master_mode is to enable/disable ETSI SRD
- * channels in master mode PCL and ACS functionality. It is now deprecated.
- * So, defining a new macro ETSI_SRD_CHAN_IN_MASTER_MODE with default value.
- *
- * Bit map for enabling the SRD mode in various modes are as follows:-
- * BIT 0:- Enable/Disable SRD channels for SAP.
- * BIT 1:- Enable/Disable SRD channels for P2P-GO.
- * BIT 2:- Enable/Disable SRD channels for NAN.
- * Rest of the bits are currently reserved for future SRD channel support for
- * other vdevs.
- */
-#define ETSI_SRD_CHAN_IN_MASTER_MODE (6)
-
/*
* Following time is used to program WOW_TIMER_PATTERN to FW so that FW will
* wake host up to do graceful disconnect in case PEER remains un-authorized
diff --git a/components/mlme/core/src/wlan_mlme_main.c b/components/mlme/core/src/wlan_mlme_main.c
index 2a65ec1b90..c5afb28aea 100644
--- a/components/mlme/core/src/wlan_mlme_main.c
+++ b/components/mlme/core/src/wlan_mlme_main.c
@@ -2301,7 +2301,8 @@ static void mlme_init_reg_cfg(struct wlan_objmgr_psoc *psoc,
struct wlan_mlme_reg *reg)
{
reg->self_gen_frm_pwr = cfg_get(psoc, CFG_SELF_GEN_FRM_PWR);
- reg->etsi_srd_chan_in_master_mode = ETSI_SRD_CHAN_IN_MASTER_MODE;
+ reg->etsi_srd_chan_in_master_mode =
+ cfg_get(psoc, CFG_ETSI_SRD_CHAN_IN_MASTER_MODE);
reg->fcc_5dot9_ghz_chan_in_master_mode =
cfg_get(psoc, CFG_FCC_5DOT9_GHZ_CHAN_IN_MASTER_MODE);
reg->restart_beaconing_on_ch_avoid =
diff --git a/components/mlme/dispatcher/inc/cfg_mlme_reg.h b/components/mlme/dispatcher/inc/cfg_mlme_reg.h
index 341558f9a2..a65ebd4ff2 100644
--- a/components/mlme/dispatcher/inc/cfg_mlme_reg.h
+++ b/components/mlme/dispatcher/inc/cfg_mlme_reg.h
@@ -69,6 +69,39 @@
0, \
"enable 11d in world mode")
+/*
+ *
+ * etsi_srd_chan_in_master_mode - Enable/disable ETSI SRD channels in
+ * master mode PCL and ACS functionality
+ * @Min: 0
+ * @Max: 0xFF
+ * @Default: 6
+ *
+ * etsi_srd_chan_in_master_mode is to enable/disable ETSI SRD channels in
+ * master mode PCL and ACS functionality
+ * Bit map for enabling the SRD mode in various modes are as follows:-
+ * BIT 0:- Enable/Disable SRD channels for SAP.
+ * BIT 1:- Enable/Disable SRD channels for P2P-GO.
+ * BIT 2:- Enable/Disable SRD channels for NAN.
+ * Rest of the bits are currently reserved for future SRD channel support for
+ * other vdevs.
+ *
+ * Related: None
+ *
+ * Supported Feature: SAP/P2P-GO
+ *
+ * Usage: Internal/External
+ *
+ *
+ */
+#define CFG_ETSI_SRD_CHAN_IN_MASTER_MODE CFG_INI_UINT( \
+ "etsi13_srd_chan_in_master_mode", \
+ 0, \
+ 0xff, \
+ 6, \
+ CFG_VALUE_OR_DEFAULT, \
+ "enable/disable ETSI SRD channels in master mode")
+
/*
*
* fcc_5dot9_ghz_chan_in_master_mode - Enable/disable 5.9 GHz channels in
@@ -281,6 +314,7 @@
CFG(CFG_SELF_GEN_FRM_PWR) \
CFG(CFG_ENABLE_PENDING_CHAN_LIST_REQ) \
CFG(CFG_ENABLE_11D_IN_WORLD_MODE) \
+ CFG(CFG_ETSI_SRD_CHAN_IN_MASTER_MODE) \
CFG(CFG_FCC_5DOT9_GHZ_CHAN_IN_MASTER_MODE) \
CFG(CFG_RESTART_BEACONING_ON_CH_AVOID) \
CFG(CFG_INDOOR_CHANNEL_SUPPORT) \
diff --git a/components/mlme/dispatcher/src/wlan_mlme_ucfg_api.c b/components/mlme/dispatcher/src/wlan_mlme_ucfg_api.c
index 366d7a8256..467947daaf 100644
--- a/components/mlme/dispatcher/src/wlan_mlme_ucfg_api.c
+++ b/components/mlme/dispatcher/src/wlan_mlme_ucfg_api.c
@@ -1298,7 +1298,7 @@ ucfg_mlme_get_etsi_srd_chan_in_master_mode(struct wlan_objmgr_psoc *psoc,
mlme_obj = mlme_get_psoc_ext_obj(psoc);
if (!mlme_obj) {
- *value = ETSI_SRD_CHAN_IN_MASTER_MODE;
+ *value = cfg_default(CFG_ETSI_SRD_CHAN_IN_MASTER_MODE);
mlme_legacy_err("Failed to get MLME Obj");
return QDF_STATUS_E_INVAL;
}