net/mlx5e: Move repeating clear_bit in mlx5e_rx_reporter_err_rq_cqe_recover

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>

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 fc366e66d0b0f98ed431845522fa82f6b3b01389..2b946ae1d97f04d5bb0fccf8e6ebcfa09f0e8284 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
@@ -162,10 +162,10 @@ 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++;
        if (rq->channel)
@@ -173,9 +173,6 @@ static int mlx5e_rx_reporter_err_rq_cqe_recover(void *ctx)
        else
                mlx5e_trigger_napi_sched(rq->cq.napi);
        return 0;
-out:
-       clear_bit(MLX5E_RQ_STATE_RECOVERING, &rq->state);
-       return err;
 }
 
 static int mlx5e_rx_reporter_timeout_recover(void *ctx)