diff --git a/core/hdd/inc/wlan_hdd_oemdata.h b/core/hdd/inc/wlan_hdd_oemdata.h
index 58b704634078..5f117399b502 100644
--- a/core/hdd/inc/wlan_hdd_oemdata.h
+++ b/core/hdd/inc/wlan_hdd_oemdata.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2020 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -261,14 +261,20 @@ int wlan_hdd_cfg80211_oem_data_handler(struct wiphy *wiphy,
 				       struct wireless_dev *wdev,
 				       const void *data, int data_len);
 
-#define FEATURE_OEM_DATA_VENDOR_COMMANDS                        \
-{                                                               \
-	.info.vendor_id = QCA_NL80211_VENDOR_ID,                \
-	.info.subcmd = QCA_NL80211_VENDOR_SUBCMD_OEM_DATA,      \
-	.flags = WIPHY_VENDOR_CMD_NEED_WDEV |                   \
-		WIPHY_VENDOR_CMD_NEED_NETDEV |                  \
-		WIPHY_VENDOR_CMD_NEED_RUNNING,                  \
-	.doit = wlan_hdd_cfg80211_oem_data_handler              \
+extern const struct nla_policy
+	oem_data_attr_policy
+	[QCA_WLAN_VENDOR_ATTR_OEM_DATA_PARAMS_MAX + 1];
+
+#define FEATURE_OEM_DATA_VENDOR_COMMANDS                                \
+{                                                                       \
+	.info.vendor_id = QCA_NL80211_VENDOR_ID,                        \
+	.info.subcmd = QCA_NL80211_VENDOR_SUBCMD_OEM_DATA,              \
+	.flags = WIPHY_VENDOR_CMD_NEED_WDEV |                           \
+		WIPHY_VENDOR_CMD_NEED_NETDEV |                          \
+		WIPHY_VENDOR_CMD_NEED_RUNNING,                          \
+	.doit = wlan_hdd_cfg80211_oem_data_handler,                     \
+	vendor_command_policy(oem_data_attr_policy,                     \
+			      QCA_WLAN_VENDOR_ATTR_OEM_DATA_PARAMS_MAX) \
 },
 #else
 #define FEATURE_OEM_DATA_VENDOR_COMMANDS
diff --git a/core/hdd/src/wlan_hdd_oemdata.c b/core/hdd/src/wlan_hdd_oemdata.c
index 184a15a2cfe1..b109dea8635f 100644
--- a/core/hdd/src/wlan_hdd_oemdata.c
+++ b/core/hdd/src/wlan_hdd_oemdata.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2020 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -1118,7 +1118,7 @@ int oem_deactivate_service(void)
 #endif
 
 #ifdef FEATURE_OEM_DATA
-static const struct nla_policy
+const struct nla_policy
 oem_data_attr_policy[QCA_WLAN_VENDOR_ATTR_OEM_DATA_PARAMS_MAX + 1] = {
 	[QCA_WLAN_VENDOR_ATTR_OEM_DATA_CMD_DATA] = {
 						    .type = NLA_BINARY,