Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide

[karo-tx-linux.git] / drivers / net / ethernet / mellanox / mlx5 / core / eq.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eq.c b/drivers/net/ethernet/mellanox/mlx5/core/eq.c
index a40b96d4c6621231987ece6fb5364384c4714e4c..713ead583347f1002bd8022ed443466b3e1bf11a 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eq.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eq.c
@@ -346,6 +346,7 @@ int mlx5_create_map_eq(struct mlx5_core_dev *dev, struct mlx5_eq *eq, u8 vecidx,
        int inlen;
 
        eq->nent = roundup_pow_of_two(nent + MLX5_NUM_SPARE_EQE);
+       eq->cons_index = 0;
        err = mlx5_buf_alloc(dev, eq->nent * MLX5_EQE_SIZE, &eq->buf);
        if (err)
                return err;
@@ -381,10 +382,10 @@ int mlx5_create_map_eq(struct mlx5_core_dev *dev, struct mlx5_eq *eq, u8 vecidx,
                 name, pci_name(dev->pdev));
 
        eq->eqn = out.eq_number;
-       eq->irqn = vecidx;
+       eq->irqn = priv->msix_arr[vecidx].vector;
        eq->dev = dev;
        eq->doorbell = uar->map + MLX5_EQ_DOORBEL_OFFSET;
-       err = request_irq(priv->msix_arr[vecidx].vector, mlx5_msix_handler, 0,
+       err = request_irq(eq->irqn, mlx5_msix_handler, 0,
                          priv->irq_info[vecidx].name, eq);
        if (err)
                goto err_eq;
@@ -420,12 +421,12 @@ int mlx5_destroy_unmap_eq(struct mlx5_core_dev *dev, struct mlx5_eq *eq)
        int err;
 
        mlx5_debug_eq_remove(dev, eq);
-       free_irq(dev->priv.msix_arr[eq->irqn].vector, eq);
+       free_irq(eq->irqn, eq);
        err = mlx5_cmd_destroy_eq(dev, eq->eqn);
        if (err)
                mlx5_core_warn(dev, "failed to destroy a previously created eq: eqn %d\n",
                               eq->eqn);
-       synchronize_irq(dev->priv.msix_arr[eq->irqn].vector);
+       synchronize_irq(eq->irqn);
        mlx5_buf_free(dev, &eq->buf);
 
        return err;