diff options
| author | David S. Miller <davem@davemloft.net> | 2017-05-26 20:46:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-05-26 20:46:35 -0400 |
| commit | 34aa83c2fc23e055968387c8b78ac8bafd735aff (patch) | |
| tree | a53a341d74613e512bf467ea12615f509cb53536 /drivers/net/ethernet/mellanox/mlx5/core/health.c | |
| parent | 47936d35edbac5e58064bd15e51136050b2f2717 (diff) | |
| parent | e2a9aa5ab2a4d1fb05fcdfa9661d54e437093297 (diff) | |
| download | linux-stable-34aa83c2fc23e055968387c8b78ac8bafd735aff.tar.gz linux-stable-34aa83c2fc23e055968387c8b78ac8bafd735aff.tar.bz2 linux-stable-34aa83c2fc23e055968387c8b78ac8bafd735aff.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Overlapping changes in drivers/net/phy/marvell.c, bug fix in 'net'
restricting a HW workaround alongside cleanups in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/health.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/health.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/health.c b/drivers/net/ethernet/mellanox/mlx5/core/health.c index c3cedb6cec3f..80b23333de7a 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/health.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/health.c @@ -90,7 +90,7 @@ static void trigger_cmd_completions(struct mlx5_core_dev *dev) spin_unlock_irqrestore(&dev->cmd.alloc_lock, flags); mlx5_core_dbg(dev, "vector 0x%llx\n", vector); - mlx5_cmd_comp_handler(dev, vector); + mlx5_cmd_comp_handler(dev, vector, true); return; no_trig: |