diff --git a/wmi_unified_api.h b/wmi_unified_api.h
index 0d371864c5..23985fff57 100644
--- a/wmi_unified_api.h
+++ b/wmi_unified_api.h
@@ -1170,11 +1170,9 @@ QDF_STATUS wmi_extract_dcs_cw_int(void *wmi_hdl, void *evt_buf,
 QDF_STATUS wmi_extract_dcs_im_tgt_stats(void *wmi_hdl, void *evt_buf,
 		wmi_host_dcs_im_tgt_stats_t *wlan_stat);
 
-QDF_STATUS wmi_extract_fips_event_error_status(void *wmi_hdl, void *evt_buf,
-		uint32_t *err_status);
-
 QDF_STATUS wmi_extract_fips_event_data(void *wmi_hdl, void *evt_buf,
-		uint32_t *data_len, uint32_t **data);
+		struct wmi_host_fips_event_param *param);
+
 QDF_STATUS wmi_extract_vdev_start_resp(void *wmi_hdl, void *evt_buf,
 		wmi_host_vdev_start_resp *vdev_rsp);
 QDF_STATUS wmi_extract_tbttoffset_update_params(void *wmi_hdl, void *evt_buf,
diff --git a/wmi_unified_param.h b/wmi_unified_param.h
index 046eb3f872..2c748f9871 100644
--- a/wmi_unified_param.h
+++ b/wmi_unified_param.h
@@ -131,13 +131,11 @@
 #define WMI_HOST_PDEV_BEACON_PRIORITY_BIT (1<<4)
 #define WMI_HOST_PDEV_MGMT_PRIORITY_BIT   (1<<5)
 
-#ifdef CONFIG_WIN
-#if ATH_SUPPORT_FIPS
 #define FIPS_ALIGN 4
-#define FIPS_ALIGNTO(__addr, __to) ((((unsigned long int)(__addr)) + (__to) -  1) & ~((__to) - 1))
-#define FIPS_IS_ALIGNED(__addr, __to) (!(((unsigned long int)(__addr)) & ((__to)-1)))
-#endif
-#endif
+#define FIPS_ALIGNTO(__addr, __to) \
+		((((unsigned long int)(__addr)) + (__to) -  1) & ~((__to) - 1))
+#define FIPS_IS_ALIGNED(__addr, __to) \
+		(!(((unsigned long int)(__addr)) & ((__to)-1)))
 
 #define WMI_HOST_F_MS(_v, _f)	\
 	(((_v) & (_f)) >> (_f##_S))
@@ -7235,4 +7233,18 @@ struct wmi_host_dcs_interference_param {
 	uint32_t pdev_id;
 };
 
+/*
+ * struct wmi_host_fips_event_param: FIPS event param
+ * @pdev_id: pdev id
+ * @error_status: Error status: 0 (no err), 1, or OPER_TIMEOUR
+ * @data_len: FIPS data lenght
+ * @data: pointer to data
+ */
+struct wmi_host_fips_event_param {
+	uint32_t pdev_id;
+	uint32_t error_status;
+	uint32_t data_len;
+	uint32_t *data;
+};
+
 #endif /* _WMI_UNIFIED_PARAM_H_ */
diff --git a/wmi_unified_priv.h b/wmi_unified_priv.h
index 0de7b943af..56237ee0cc 100644
--- a/wmi_unified_priv.h
+++ b/wmi_unified_priv.h
@@ -1008,11 +1008,9 @@ QDF_STATUS (*extract_dcs_cw_int)(wmi_unified_t wmi_handle, void *evt_buf,
 QDF_STATUS (*extract_dcs_im_tgt_stats)(wmi_unified_t wmi_handle, void *evt_buf,
 	wmi_host_dcs_im_tgt_stats_t *wlan_stat);
 
-QDF_STATUS (*extract_fips_event_error_status)(wmi_unified_t wmi_handle,
-	void *evt_buf, uint32_t *err_status);
-
 QDF_STATUS (*extract_fips_event_data)(wmi_unified_t wmi_handle,
-	void *evt_buf, uint32_t *data_len, uint32_t **data);
+	void *evt_buf, struct wmi_host_fips_event_param *param);
+
 QDF_STATUS (*extract_vdev_start_resp)(wmi_unified_t wmi_handle, void *evt_buf,
 	wmi_host_vdev_start_resp *vdev_rsp);