From: Valentine Fatiev <valentinef@nvidia.com>
Subject: [PATCH] BACKPORT:
 drivers/net/ethernet/mellanox/mlx5/core/diag/reporter_vnic.h

Change-Id: I2d3b8413efec303bb970fc00cb35b02dafb766c3
---
 .../net/ethernet/mellanox/mlx5/core/diag/reporter_vnic.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

--- a/drivers/net/ethernet/mellanox/mlx5/core/diag/reporter_vnic.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/diag/reporter_vnic.h
@@ -4,13 +4,20 @@
 #ifndef __MLX5_REPORTER_VNIC_H
 #define __MLX5_REPORTER_VNIC_H
 
+#ifdef HAVE_DEVLINK_HEALTH_REPORT_SUPPORT
 #include "mlx5_core.h"
 
 void mlx5_reporter_vnic_create(struct mlx5_core_dev *dev);
 void mlx5_reporter_vnic_destroy(struct mlx5_core_dev *dev);
 
-void mlx5_reporter_vnic_diagnose_counters(struct mlx5_core_dev *dev,
+#ifndef HAVE_INT_DEVLINK_FMSG_U8_PAIR
+void
+#else
+int
+#endif
+mlx5_reporter_vnic_diagnose_counters(struct mlx5_core_dev *dev,
 					  struct devlink_fmsg *fmsg,
 					  u16 vport_num, bool other_vport);
 
+#endif /* HAVE_DEVLINK_HEALTH_REPORT_SUPPORT */
 #endif /* __MLX5_REPORTER_VNIC_H */
