aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEran Ben Elisha <eranbe@mellanox.com>2019-12-04 14:34:18 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-01-12 12:21:50 +0100
commit0c3990776fca7349acf560049de6aaa18a6e56ba (patch)
tree20f275952e82d9d43a38d2a14a35768e6f976d2c
parenta51aa28f46763f79cfa1fd8ffc5e45c1967e3550 (diff)
downloadlinux-yocto-0c3990776fca7349acf560049de6aaa18a6e56ba.tar.gz
linux-yocto-0c3990776fca7349acf560049de6aaa18a6e56ba.tar.bz2
linux-yocto-0c3990776fca7349acf560049de6aaa18a6e56ba.zip
net/mlx5e: Always print health reporter message to dmesg
[ Upstream commit 99cda45426c9a2c59bb2f7cb886a405440282455 ] In case a reporter exists, error message is logged only to the devlink tracer. The devlink tracer is a visibility utility only, which user can choose not to monitor. After cited patch, 3rd party monitoring tools that tracks these error message will no longer find them in dmesg, causing a regression. With this patch, error messages are also logged into the dmesg. Fixes: c50de4af1d63 ("net/mlx5e: Generalize tx reporter's functionality") Signed-off-by: Eran Ben Elisha <eranbe@mellanox.com> Signed-off-by: Saeed Mahameed <saeedm@mellanox.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/ethernet/mellanox/mlx5/core/en/health.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/health.c b/drivers/net/ethernet/mellanox/mlx5/core/en/health.c
index 1d6b58860da6..3a975641f902 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/health.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/health.c
@@ -197,9 +197,10 @@ int mlx5e_health_report(struct mlx5e_priv *priv,
struct devlink_health_reporter *reporter, char *err_str,
struct mlx5e_err_ctx *err_ctx)
{
- if (!reporter) {
- netdev_err(priv->netdev, err_str);
+ netdev_err(priv->netdev, err_str);
+
+ if (!reporter)
return err_ctx->recover(&err_ctx->ctx);
- }
+
return devlink_health_report(reporter, err_str, err_ctx);
}