diff options
| author | David S. Miller <davem@davemloft.net> | 2019-03-04 22:00:43 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-03-04 22:00:43 +0300 |
| commit | d6089c741803acc53e23141998c3437b058c8d3a (patch) | |
| tree | c5b0fac6a3c38350ddaf679a5823187d4845d7d6 /drivers | |
| parent | 901efe12318b1ea8d3e2c88a7b75ed6e6d5d7245 (diff) | |
| parent | 86d7e714993edf36f6739dabdefb06102d26dd2d (diff) | |
| download | linux-d6089c741803acc53e23141998c3437b058c8d3a.tar.xz | |
Merge branch 'Devlink-health-updates'
Eran Ben Elisha says:
====================
Devlink health updates
This patchset includes a fix [patch 01] to the devlink health state update, in
case recover was aborted.
In addition, it includes a small enhancement to the infrastructure in order to
allow direct state update in run-time, and use it from mlx5e tx reporter.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c index e5f74eb986b3..b5fdbd3190d9 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -2302,6 +2302,10 @@ int mlx5e_open_channels(struct mlx5e_priv *priv, goto err_close_channels; } + if (!IS_ERR_OR_NULL(priv->tx_reporter)) + devlink_health_reporter_state_update(priv->tx_reporter, + DEVLINK_HEALTH_REPORTER_STATE_HEALTHY); + kvfree(cparam); return 0; |