net/mlx5e: Move repeating clear_bit in mlx5e_rx_reporter_err_rq_cqe_recover

[ Upstream commit e64d71d055ca01fa5054d25b99fb29b98e543a31 ]

The same clear_bit is called in both error and success flows. Move the
call to do it only once and remove the out label.

Signed-off-by: Maxim Mikityanskiy <maximmi@nvidia.com>
Reviewed-by: Saeed Mahameed <saeedm@nvidia.com>
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Stable-dep-of: 1e66220948df ("net/mlx5e: Update rx ring hw mtu upon each rx-fcs flag change")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
index e329158fdc555105d0bd1bfcbce21441ed835921..0f1dbad7c9f1a24d7aea175f6fba1b64b71f40a0 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
@@ -157,16 +157,13 @@ static int mlx5e_rx_reporter_err_rq_cqe_recover(void *ctx)
        mlx5e_free_rx_descs(rq);
 
        err = mlx5e_rq_to_ready(rq, MLX5_RQC_STATE_ERR);
+       clear_bit(MLX5E_RQ_STATE_RECOVERING, &rq->state);
        if (err)
-               goto out;
+               return err;
 
-       clear_bit(MLX5E_RQ_STATE_RECOVERING, &rq->state);
        mlx5e_activate_rq(rq);
        rq->stats->recover++;
        return 0;
-out:
-       clear_bit(MLX5E_RQ_STATE_RECOVERING, &rq->state);
-       return err;
 }
 
 static int mlx5e_rx_reporter_timeout_recover(void *ctx)