diff --git a/core/hdd/inc/qc_sap_ioctl.h b/core/hdd/inc/qc_sap_ioctl.h
index c29d49a809..880b96b94a 100644
--- a/core/hdd/inc/qc_sap_ioctl.h
+++ b/core/hdd/inc/qc_sap_ioctl.h
@@ -194,6 +194,45 @@ typedef struct {
#define RC_2_RATE_IDX_11AX(_rc) ((_rc) & 0x1f)
#define HT_RC_2_STREAMS_11AX(_rc) (((_rc) >> 5) & 0x7)
+/*
+ *
+ * setRadar - simulate a radar event
+ *
+ * @INPUT: None
+ *
+ * @OUTPUT: None
+ *
+ * This IOCTL is used to simulate a radar event, state machines for
+ * SAP will behave as same way in which a radar event is reported by WMA
+ *
+ * @E.g: iwpriv wlan0 setRadar
+ *
+ * Supported Feature: DFS
+ *
+ * Usage: Internal
+ *
+ *
+ */
+
+/*
+ *
+ * setRadarDbg - enable/disable radar specific logs
+ *
+ * @INPUT: 1/0
+ *
+ * @OUTPUT: None
+ *
+ * This IOCTL is enable radar phyerror info in wma
+ *
+ * @E.g: iwpriv wlan0 setRadarDbg
+ * iwpriv wlan0 setRadarDbg 1
+ *
+ * Supported Feature: DFS
+ *
+ * Usage: Internal
+ *
+ *
+ */
enum {
QCSAP_PARAM_MAX_ASSOC = 1,
QCSAP_PARAM_GET_WLAN_DBG,
diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h
index 9f30f5d5f1..6722a67e85 100644
--- a/core/hdd/inc/wlan_hdd_cfg.h
+++ b/core/hdd/inc/wlan_hdd_cfg.h
@@ -3732,6 +3732,50 @@ enum station_keepalive_method {
#define CFG_ENABLE_BYPASS_11D_MAX (1)
#define CFG_ENABLE_BYPASS_11D_DEFAULT (1)
+/*
+ * gEnableDFSChnlScan - enable dfs channel scan.
+ * @Min: 0
+ * @Max: 1
+ * @Default: 1
+ *
+ * This ini is used to enable/disable dfs channels in scan, enabling this
+ * will enable driver to include dfs channels in its scan list.
+ * Related: NA
+ *
+ * Supported Feature: DFS, Scan
+ *
+ * Usage: Internal/External
+ *
+ *
+ */
+#define CFG_ENABLE_DFS_CHNL_SCAN_NAME "gEnableDFSChnlScan"
+#define CFG_ENABLE_DFS_CHNL_SCAN_MIN (0)
+#define CFG_ENABLE_DFS_CHNL_SCAN_MAX (1)
+#define CFG_ENABLE_DFS_CHNL_SCAN_DEFAULT (1)
+
+/*
+ *
+ * gEnableDFSPnoChnlScan - enable dfs channels in PNO scan
+ * @Min: 0
+ * @Max: 1
+ * @Default: 1
+ *
+ * This ini is used to enable/disable dfs channels in PNO scan request,
+ * enabling this ini enables driver to include dfs channels in its
+ * PNO scan request
+ * Related: NA
+ *
+ * Supported Feature: DFS, PNO
+ *
+ * Usage: Internal/External
+ *
+ *
+ */
+#define CFG_ENABLE_DFS_PNO_CHNL_SCAN_NAME "gEnableDFSPnoChnlScan"
+#define CFG_ENABLE_DFS_PNO_CHNL_SCAN_MIN (0)
+#define CFG_ENABLE_DFS_PNO_CHNL_SCAN_MAX (1)
+#define CFG_ENABLE_DFS_PNO_CHNL_SCAN_DEFAULT (1)
+
/*
*
* gEnableDumpCollect - It will use for collect the dumps
@@ -4162,26 +4206,115 @@ typedef enum {
#define CFG_HT_SMPS_CAP_FEATURE_MAX (3)
#define CFG_HT_SMPS_CAP_FEATURE_DEFAULT (3)
+/*
+ *
+ * gDisableDFSChSwitch - Disable channel switch if radar is found
+ * @Min: 0
+ * @Max: 1
+ * @Default: 0
+ *
+ * This ini is used to disable channel switch if radar is found
+ * on that channel.
+ * Related: NA.
+ *
+ * Supported Feature: DFS
+ *
+ * Usage: Internal
+ *
+ *
+ */
#define CFG_DISABLE_DFS_CH_SWITCH "gDisableDFSChSwitch"
#define CFG_DISABLE_DFS_CH_SWITCH_MIN (0)
#define CFG_DISABLE_DFS_CH_SWITCH_MAX (1)
#define CFG_DISABLE_DFS_CH_SWITCH_DEFAULT (0)
+/*
+ *
+ * gEnableDFSMasterCap - Enable DFS master capability
+ * @Min: 0
+ * @Max: 1
+ * @Default: 0
+ *
+ * This ini is used to enable/disable the DFS master capability.
+ * Disabling it will cause driver to not advertise the spectrum
+ * management capability
+ * Related: NA.
+ *
+ * Supported Feature: DFS
+ *
+ * Usage: Internal/External
+ *
+ *
+ */
#define CFG_ENABLE_DFS_MASTER_CAPABILITY "gEnableDFSMasterCap"
#define CFG_ENABLE_DFS_MASTER_CAPABILITY_MIN (0)
#define CFG_ENABLE_DFS_MASTER_CAPABILITY_MAX (1)
#define CFG_ENABLE_DFS_MASTER_CAPABILITY_DEFAULT (0)
+/*
+ *
+ * gSapPreferredChanLocation - Restrict channel switches between ondoor and
+ * outdoor.
+ * @Min: 0
+ * @Max: 2
+ * @Default: 0
+ *
+ * This ini is used for restricting channel switches between Indoor and outdoor
+ * channels after radar detection.
+ * 0- No preferred channel location
+ * 1- Use indoor channels only
+ * 2- Use outdoor channels only
+ * Related: NA.
+ *
+ * Supported Feature: DFS
+ *
+ * Usage: Internal/External
+ *
+ *
+ */
#define CFG_SAP_PREFERRED_CHANNEL_LOCATION "gSapPreferredChanLocation"
#define CFG_SAP_PREFERRED_CHANNEL_LOCATION_MIN (0)
#define CFG_SAP_PREFERRED_CHANNEL_LOCATION_MAX (2)
#define CFG_SAP_PREFERRED_CHANNEL_LOCATION_DEFAULT (0)
+/*
+ *
+ * gDisableDfsJapanW53 - Block W53 channels in random channel selection
+ * @Min: 0
+ * @Max: 1
+ * @Default: 0
+ *
+ * This ini is used to block W53 Japan channel in random channel selection
+ * Related: NA.
+ *
+ * Supported Feature: DFS
+ *
+ * Usage: Internal/External
+ *
+ *
+ */
#define CFG_DISABLE_DFS_JAPAN_W53 "gDisableDfsJapanW53"
#define CFG_DISABLE_DFS_JAPAN_W53_MIN (0)
#define CFG_DISABLE_DFS_JAPAN_W53_MAX (1)
#define CFG_DISABLE_DFS_JAPAN_W53_DEFAULT (0)
+/*
+ *
+ * gDisableDfsJapanW53 - Enable dfs phyerror filtering offload in FW
+ * @Min: 0
+ * @Max: 1
+ * @Default: 1
+ *
+ * This ini is used to to enable dfs phyerror filtering offload to firmware
+ * Enabling it will cause basic phy error to be discarding in firmware.
+ * Related: NA.
+ *
+ * Supported Feature: DFS
+ *
+ * Usage: Internal/External
+ *
+ *
+ */
#define CFG_ENABLE_DFS_PHYERR_FILTEROFFLOAD_NAME "dfsPhyerrFilterOffload"
#define CFG_ENABLE_DFS_PHYERR_FILTEROFFLOAD_MIN (0)
#define CFG_ENABLE_DFS_PHYERR_FILTEROFFLOAD_MAX (1)
@@ -4569,6 +4702,22 @@ typedef enum {
* 0 - Don't Skip DFS Channel in case of P2P Search
* 1 - Skip DFS Channel in case of P2P Search
*/
+/*
+ *
+ * gSkipDfsChannelInP2pSearch - Skip DFS Channel in case of P2P Search
+ * @Min: 0
+ * @Max: 1
+ * @Default: 1
+ *
+ * This ini is used to to disable(skip) dfs channel in p2p search.
+ * Related: NA.
+ *
+ * Supported Feature: DFS P2P
+ *
+ * Usage: Internal/External
+ *
+ *
+ */
#define CFG_ENABLE_SKIP_DFS_IN_P2P_SEARCH_NAME "gSkipDfsChannelInP2pSearch"
#define CFG_ENABLE_SKIP_DFS_IN_P2P_SEARCH_MIN (0)
#define CFG_ENABLE_SKIP_DFS_IN_P2P_SEARCH_MAX (1)