diff --git a/target_if/regulatory/inc/target_if_reg.h b/target_if/regulatory/inc/target_if_reg.h
index db8ea0171f..2159c57475 100644
--- a/target_if/regulatory/inc/target_if_reg.h
+++ b/target_if/regulatory/inc/target_if_reg.h
@@ -101,7 +101,7 @@ QDF_STATUS target_if_regulatory_set_ext_tpc(struct wlan_objmgr_psoc *psoc);
 struct wlan_lmac_if_reg_tx_ops *
 target_if_regulatory_get_tx_ops(struct wlan_objmgr_psoc *psoc);
 
-#if defined(CONFIG_BAND_6GHZ) && defined(CONFIG_REG_CLIENT)
+#if defined(CONFIG_BAND_6GHZ)
 /**
  * target_if_reg_set_lower_6g_edge_ch_info() - populate lower 6ghz edge channel
  * enablement info
diff --git a/target_if/regulatory/src/target_if_reg.c b/target_if/regulatory/src/target_if_reg.c
index 666324cab1..a2228cffb2 100644
--- a/target_if/regulatory/src/target_if_reg.c
+++ b/target_if/regulatory/src/target_if_reg.c
@@ -745,7 +745,7 @@ QDF_STATUS target_if_regulatory_set_ext_tpc(struct wlan_objmgr_psoc *psoc)
 	return QDF_STATUS_SUCCESS;
 }
 
-#if defined(CONFIG_BAND_6GHZ) && defined(CONFIG_REG_CLIENT)
+#if defined(CONFIG_BAND_6GHZ)
 /**
  * tgt_if_regulatory_is_lower_6g_edge_ch_supp() - Check if lower 6ghz
  * edge channel (5935MHz) is supported
diff --git a/umac/global_umac_dispatcher/lmac_if/inc/wlan_lmac_if_def.h b/umac/global_umac_dispatcher/lmac_if/inc/wlan_lmac_if_def.h
index bfb324e9c4..5ffaefcc18 100644
--- a/umac/global_umac_dispatcher/lmac_if/inc/wlan_lmac_if_def.h
+++ b/umac/global_umac_dispatcher/lmac_if/inc/wlan_lmac_if_def.h
@@ -1252,7 +1252,7 @@ struct wlan_lmac_if_reg_rx_ops {
 					     uint8_t *bitmap);
 	QDF_STATUS (*reg_set_ext_tpc_supported)(struct wlan_objmgr_psoc *psoc,
 						bool val);
-#if defined(CONFIG_BAND_6GHZ) && defined(CONFIG_REG_CLIENT)
+#if defined(CONFIG_BAND_6GHZ)
 	QDF_STATUS
 	(*reg_set_lower_6g_edge_ch_supp)(struct wlan_objmgr_psoc *psoc,
 					 bool val);
diff --git a/umac/global_umac_dispatcher/lmac_if/src/wlan_lmac_if.c b/umac/global_umac_dispatcher/lmac_if/src/wlan_lmac_if.c
index 4f2e029b6c..e8c3962ea6 100644
--- a/umac/global_umac_dispatcher/lmac_if/src/wlan_lmac_if.c
+++ b/umac/global_umac_dispatcher/lmac_if/src/wlan_lmac_if.c
@@ -303,7 +303,7 @@ static inline void wlan_lmac_if_register_master_list_ext_handler(
 }
 #endif
 
-#if defined(CONFIG_BAND_6GHZ) && defined(CONFIG_REG_CLIENT)
+#if defined(CONFIG_BAND_6GHZ)
 static void wlan_lmac_if_register_6g_edge_chan_supp(
 					struct wlan_lmac_if_rx_ops *rx_ops)
 {
diff --git a/umac/regulatory/core/src/reg_build_chan_list.c b/umac/regulatory/core/src/reg_build_chan_list.c
index bb3ba4ca78..7611be97db 100644
--- a/umac/regulatory/core/src/reg_build_chan_list.c
+++ b/umac/regulatory/core/src/reg_build_chan_list.c
@@ -846,7 +846,7 @@ reg_modify_chan_list_for_5dot9_ghz_channels(struct wlan_objmgr_pdev *pdev,
 	}
 }
 
-#if defined(CONFIG_BAND_6GHZ) && defined(CONFIG_REG_CLIENT)
+#if defined(CONFIG_BAND_6GHZ)
 /**
  * reg_modify_chan_list_for_6g_edge_channels() - Modify 6 GHz edge channels
  *
diff --git a/umac/regulatory/core/src/reg_priv_objs.h b/umac/regulatory/core/src/reg_priv_objs.h
index f36e915880..a2d74c17f8 100644
--- a/umac/regulatory/core/src/reg_priv_objs.h
+++ b/umac/regulatory/core/src/reg_priv_objs.h
@@ -166,7 +166,7 @@ struct wlan_regulatory_psoc_priv_obj {
 	uint8_t domain_code_6g_client[REG_CURRENT_MAX_AP_TYPE][REG_MAX_CLIENT_TYPE];
 #endif
 	bool is_ext_tpc_supported;
-#if defined(CONFIG_BAND_6GHZ) && defined(CONFIG_REG_CLIENT)
+#if defined(CONFIG_BAND_6GHZ)
 	bool is_lower_6g_edge_ch_supported;
 	bool is_upper_6g_edge_ch_disabled;
 #endif
diff --git a/umac/regulatory/core/src/reg_services_common.c b/umac/regulatory/core/src/reg_services_common.c
index ef541d5170..ffbcde25f0 100644
--- a/umac/regulatory/core/src/reg_services_common.c
+++ b/umac/regulatory/core/src/reg_services_common.c
@@ -5032,7 +5032,7 @@ bool reg_is_ext_tpc_supported(struct wlan_objmgr_psoc *psoc)
 	return psoc_priv_obj->is_ext_tpc_supported;
 }
 
-#if defined(CONFIG_BAND_6GHZ) && defined(CONFIG_REG_CLIENT)
+#if defined(CONFIG_BAND_6GHZ)
 QDF_STATUS
 reg_set_lower_6g_edge_ch_supp(struct wlan_objmgr_psoc *psoc, bool val)
 {
diff --git a/umac/regulatory/core/src/reg_services_common.h b/umac/regulatory/core/src/reg_services_common.h
index 63191ae0cc..266cd5c55b 100644
--- a/umac/regulatory/core/src/reg_services_common.h
+++ b/umac/regulatory/core/src/reg_services_common.h
@@ -1531,7 +1531,7 @@ void reg_set_2g_channel_params_for_freq(struct wlan_objmgr_pdev *pdev,
 enum channel_state reg_combine_channel_states(enum channel_state chan_state1,
 					      enum channel_state chan_state2);
 
-#if defined(CONFIG_BAND_6GHZ) && defined(CONFIG_REG_CLIENT)
+#if defined(CONFIG_BAND_6GHZ)
 /**
  * reg_set_lower_6g_edge_ch_supp() - Set if lower 6ghz edge channel is
  * supported by FW
diff --git a/umac/regulatory/dispatcher/inc/wlan_reg_tgt_api.h b/umac/regulatory/dispatcher/inc/wlan_reg_tgt_api.h
index fdc5293dab..583aa7c280 100644
--- a/umac/regulatory/dispatcher/inc/wlan_reg_tgt_api.h
+++ b/umac/regulatory/dispatcher/inc/wlan_reg_tgt_api.h
@@ -116,7 +116,7 @@ QDF_STATUS tgt_reg_set_5dot9_ghz_supported(struct wlan_objmgr_psoc *psoc,
 QDF_STATUS tgt_reg_set_ext_tpc_supported(struct wlan_objmgr_psoc *psoc,
 					 bool val);
 
-#if defined(CONFIG_BAND_6GHZ) && defined(CONFIG_REG_CLIENT)
+#if defined(CONFIG_BAND_6GHZ)
 /**
  * tgt_reg_set_lower_6g_edge_ch_supp() - Assign the value set by FW for lower
  * 6ghz edge channel (5935 MHz) support
diff --git a/umac/regulatory/dispatcher/src/wlan_reg_tgt_api.c b/umac/regulatory/dispatcher/src/wlan_reg_tgt_api.c
index 9101746b15..c0de51241a 100644
--- a/umac/regulatory/dispatcher/src/wlan_reg_tgt_api.c
+++ b/umac/regulatory/dispatcher/src/wlan_reg_tgt_api.c
@@ -124,7 +124,7 @@ QDF_STATUS tgt_reg_set_ext_tpc_supported(struct wlan_objmgr_psoc *psoc,
 	return reg_set_ext_tpc_supported(psoc, val);
 }
 
-#if defined(CONFIG_BAND_6GHZ) && defined(CONFIG_REG_CLIENT)
+#if defined(CONFIG_BAND_6GHZ)
 QDF_STATUS tgt_reg_set_lower_6g_edge_ch_supp(struct wlan_objmgr_psoc *psoc,
 					     bool val)
 {
diff --git a/wmi/inc/wmi_unified_param.h b/wmi/inc/wmi_unified_param.h
index e5dcfa9e90..be4bb7a3c7 100644
--- a/wmi/inc/wmi_unified_param.h
+++ b/wmi/inc/wmi_unified_param.h
@@ -5238,7 +5238,7 @@ typedef enum {
 	wmi_service_ext_tpc_reg_support,
 	wmi_service_ndi_txbf_support,
 	wmi_service_reg_cc_ext_event_support,
-#if defined(CONFIG_BAND_6GHZ) && defined(CONFIG_REG_CLIENT)
+#if defined(CONFIG_BAND_6GHZ)
 	wmi_service_lower_6g_edge_ch_supp,
 	wmi_service_disable_upper_6g_edge_ch_supp,
 #endif
diff --git a/wmi/src/wmi_unified_tlv.c b/wmi/src/wmi_unified_tlv.c
index c6d67e7c7a..aab9418d51 100644
--- a/wmi/src/wmi_unified_tlv.c
+++ b/wmi/src/wmi_unified_tlv.c
@@ -16270,7 +16270,7 @@ static void populate_tlv_service(uint32_t *wmi_service)
 			WMI_SERVICE_NDI_TXBF_SUPPORT;
 	wmi_service[wmi_service_reg_cc_ext_event_support] =
 			WMI_SERVICE_REG_CC_EXT_EVENT_SUPPORT;
-#if defined(CONFIG_BAND_6GHZ) && defined(CONFIG_REG_CLIENT)
+#if defined(CONFIG_BAND_6GHZ)
 	wmi_service[wmi_service_lower_6g_edge_ch_supp] =
 			WMI_SERVICE_ENABLE_LOWER_6G_EDGE_CH_SUPP;
 	wmi_service[wmi_service_disable_upper_6g_edge_ch_supp] =