diff --git a/Kbuild b/Kbuild
index 08beddd..f8945a9 100644
--- a/Kbuild
+++ b/Kbuild
@@ -2050,7 +2050,6 @@
 cppflags-$(CONFIG_160MHZ_SUPPORT) += -DCONFIG_160MHZ_SUPPORT
 cppflags-$(CONFIG_MCL) += -DCONFIG_MCL
 cppflags-$(CONFIG_REG_CLIENT) += -DCONFIG_REG_CLIENT
-cppflags-$(CONFIG_LEGACY_CHAN_ENUM) += -DCONFIG_LEGACY_CHAN_ENUM
 cppflags-$(CONFIG_WLAN_PMO_ENABLE) += -DWLAN_PMO_ENABLE
 cppflags-$(CONFIG_CONVERGED_P2P_ENABLE) += -DCONVERGED_P2P_ENABLE
 cppflags-$(CONFIG_WLAN_POLICY_MGR_ENABLE) += -DWLAN_POLICY_MGR_ENABLE
@@ -2873,6 +2872,11 @@
 cppflags-y += -DSERIALIZE_VDEV_RESP_TIMER
 cppflags-y += -DTGT_IF_VDEV_MGR_CONV
 
+cppflags-y += -DCONFIG_CHAN_NUM_API
+cppflags-y += -DCONFIG_CHAN_FREQ_API
+
+cppflags-$(CONFIG_BAND_6GHZ) += -DCONFIG_BAND_6GHZ
+
 ccflags-$(CONFIG_HASTINGS_BT_WAR) += -DHASTINGS_BT_WAR
 
 cppflags-$(CONFIG_SLUB_DEBUG_ON) += -DHIF_CONFIG_SLUB_DEBUG_ON
diff --git a/configs/default_defconfig b/configs/default_defconfig
index e8e25e7..a0ae2d3 100644
--- a/configs/default_defconfig
+++ b/configs/default_defconfig
@@ -766,7 +766,6 @@
 CONFIG_160MHZ_SUPPORT := y
 CONFIG_MCL := y
 CONFIG_REG_CLIENT := y
-CONFIG_LEGACY_CHAN_ENUM := y
 CONFIG_WLAN_PMO_ENABLE := y
 CONFIG_CONVERGED_P2P_ENABLE := y
 CONFIG_WLAN_POLICY_MGR_ENABLE := y
@@ -905,4 +904,11 @@
 CONFIG_WLAN_FEATURE_DP_BUS_BANDWIDTH := y
 endif
 
+ifeq ($(CONFIG_CNSS_QCA6490), y)
+
+#Enable 6 GHz Band
+CONFIG_BAND_6GHZ := y
+
+endif
+
 CONFIG_SAP_DHCP_FW_IND := y
diff --git a/configs/genoa.common b/configs/genoa.common
index 469e04b..384fedc 100644
--- a/configs/genoa.common
+++ b/configs/genoa.common
@@ -32,7 +32,6 @@
 CONFIG_WIFI_POS_LEGACY := n
 CONFIG_FEATURE_WLAN_WAPI := y
 CONFIG_AGEIE_ON_SCAN_RESULTS := y
-CONFIG_LEGACY_CHAN_ENUM := y
 CONFIG_WLAN_PMO_ENABLE := y
 CONFIG_CONVERGED_P2P_ENABLE := y
 CONFIG_WLAN_POLICY_MGR_ENABLE := y
diff --git a/configs/qca6174_defconfig b/configs/qca6174_defconfig
index c951aba..10d1ae0 100644
--- a/configs/qca6174_defconfig
+++ b/configs/qca6174_defconfig
@@ -587,7 +587,6 @@
 CONFIG_160MHZ_SUPPORT := y
 CONFIG_MCL := y
 CONFIG_REG_CLIENT := y
-CONFIG_LEGACY_CHAN_ENUM := y
 CONFIG_WLAN_PMO_ENABLE := y
 CONFIG_CONVERGED_P2P_ENABLE := y
 CONFIG_WLAN_POLICY_MGR_ENABLE := y
diff --git a/configs/qca6390_defconfig b/configs/qca6390_defconfig
index 5995308..e9b3925 100644
--- a/configs/qca6390_defconfig
+++ b/configs/qca6390_defconfig
@@ -617,7 +617,6 @@
 CONFIG_160MHZ_SUPPORT := y
 CONFIG_MCL := y
 CONFIG_REG_CLIENT := y
-CONFIG_LEGACY_CHAN_ENUM := y
 CONFIG_WLAN_PMO_ENABLE := y
 CONFIG_CONVERGED_P2P_ENABLE := y
 CONFIG_WLAN_POLICY_MGR_ENABLE := y
diff --git a/configs/qcs40x.snoc.perf_defconfig b/configs/qcs40x.snoc.perf_defconfig
index b3f73b4..44c853c 100644
--- a/configs/qcs40x.snoc.perf_defconfig
+++ b/configs/qcs40x.snoc.perf_defconfig
@@ -23,7 +23,6 @@
 CONFIG_WIFI_POS_LEGACY := n
 CONFIG_FEATURE_WLAN_WAPI := y
 CONFIG_AGEIE_ON_SCAN_RESULTS := y
-CONFIG_LEGACY_CHAN_ENUM := y
 CONFIG_CONVERGED_P2P_ENABLE := y
 CONFIG_WLAN_POLICY_MGR_ENABLE := y
 CONFIG_SUPPORT_11AX := n