diff --git a/core/hdd/src/wlan_hdd_cfr.c b/core/hdd/src/wlan_hdd_cfr.c
index d7feb5770a23..48004420f14e 100644
--- a/core/hdd/src/wlan_hdd_cfr.c
+++ b/core/hdd/src/wlan_hdd_cfr.c
@@ -32,8 +32,8 @@
 
 const struct nla_policy cfr_config_policy[
 		QCA_WLAN_VENDOR_ATTR_PEER_CFR_MAX + 1] = {
-	[QCA_WLAN_VENDOR_ATTR_CFR_PEER_MAC_ADDR] = {
-		.type = NLA_BINARY, .len = QDF_MAC_ADDR_SIZE},
+	[QCA_WLAN_VENDOR_ATTR_CFR_PEER_MAC_ADDR] =
+		VENDOR_NLA_POLICY_MAC_ADDR,
 	[QCA_WLAN_VENDOR_ATTR_PEER_CFR_ENABLE] = {.type = NLA_FLAG},
 	[QCA_WLAN_VENDOR_ATTR_PEER_CFR_BANDWIDTH] = {.type = NLA_U8},
 	[QCA_WLAN_VENDOR_ATTR_PEER_CFR_PERIODICITY] = {.type = NLA_U32},
@@ -49,15 +49,19 @@ const struct nla_policy cfr_config_policy[
 	[QCA_WLAN_VENDOR_ATTR_PEER_CFR_UL_MU_MASK] = {.type = NLA_U64},
 	[QCA_WLAN_VENDOR_ATTR_PEER_CFR_FREEZE_TLV_DELAY_COUNT] = {
 						.type = NLA_U32},
+	[QCA_WLAN_VENDOR_ATTR_PEER_CFR_GROUP_TABLE] = {
+						.type = NLA_NESTED},
+	[QCA_WLAN_VENDOR_ATTR_PEER_CFR_GROUP_ENTRY] = {
+						.type = NLA_NESTED},
 	[QCA_WLAN_VENDOR_ATTR_PEER_CFR_GROUP_NUMBER] = {.type = NLA_U32},
-	[QCA_WLAN_VENDOR_ATTR_PEER_CFR_GROUP_TA] = {
-		.type = NLA_BINARY, .len = QDF_MAC_ADDR_SIZE},
-	[QCA_WLAN_VENDOR_ATTR_PEER_CFR_GROUP_RA] = {
-		.type = NLA_BINARY, .len = QDF_MAC_ADDR_SIZE},
-	[QCA_WLAN_VENDOR_ATTR_PEER_CFR_GROUP_TA_MASK] = {
-		.type = NLA_BINARY, .len = QDF_MAC_ADDR_SIZE},
-	[QCA_WLAN_VENDOR_ATTR_PEER_CFR_GROUP_RA_MASK] = {
-		.type = NLA_BINARY, .len = QDF_MAC_ADDR_SIZE},
+	[QCA_WLAN_VENDOR_ATTR_PEER_CFR_GROUP_TA] =
+		VENDOR_NLA_POLICY_MAC_ADDR,
+	[QCA_WLAN_VENDOR_ATTR_PEER_CFR_GROUP_RA] =
+		VENDOR_NLA_POLICY_MAC_ADDR,
+	[QCA_WLAN_VENDOR_ATTR_PEER_CFR_GROUP_TA_MASK] =
+		VENDOR_NLA_POLICY_MAC_ADDR,
+	[QCA_WLAN_VENDOR_ATTR_PEER_CFR_GROUP_RA_MASK] =
+		VENDOR_NLA_POLICY_MAC_ADDR,
 	[QCA_WLAN_VENDOR_ATTR_PEER_CFR_GROUP_NSS] = {.type = NLA_U32},
 	[QCA_WLAN_VENDOR_ATTR_PEER_CFR_GROUP_BW] = {.type = NLA_U32},
 	[QCA_WLAN_VENDOR_ATTR_PEER_CFR_GROUP_MGMT_FILTER] = {