]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
Revert "net/mlx5: Remove "recovery" arg from mlx5_load_one() function"
authorMoshe Shemesh <moshe@nvidia.com>
Sun, 9 Apr 2023 07:44:31 +0000 (10:44 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 11 May 2023 14:11:18 +0000 (23:11 +0900)
commit78f9f0ce8553fb444947776232187b2d01716b39
tree160d253ec51a7ec1bc2d406ee8167f8916514b6f
parente812db6f33b6d5161c06a7364d37956bc286b456
Revert "net/mlx5: Remove "recovery" arg from mlx5_load_one() function"

[ Upstream commit 21608a2cf38e9f743636b5f86507ffbca18ecee7 ]

This reverts commit 5977ac3910f1cbaf44dca48179118b25c206ac29.

Revert this patch as we need the "recovery" arg back in mlx5_load_one()
function. This arg will be used in the next patch for using recovery
timeout during sync reset flow.

Signed-off-by: Moshe Shemesh <moshe@nvidia.com>
Reviewed-by: Maher Sanalla <msanalla@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
Stable-dep-of: dfad99750c0f ("net/mlx5: Use recovery timeout on sync reset flow")
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c
drivers/net/ethernet/mellanox/mlx5/core/main.c
drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h