Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

[pandora-kernel.git] / drivers / net / mlx4 / en_cq.c

diff --git a/drivers/net/mlx4/en_cq.c b/drivers/net/mlx4/en_cq.c
index 23d54a0..91f50de 100644 (file)
--- a/drivers/net/mlx4/en_cq.c
+++ b/drivers/net/mlx4/en_cq.c
@@ -51,10 +51,13 @@ int mlx4_en_create_cq(struct mlx4_en_priv *priv,
        int err;
 
        cq->size = entries;
-       if (mode == RX)
+       if (mode == RX) {
                cq->buf_size = cq->size * sizeof(struct mlx4_cqe);
-       else
+               cq->vector   = ring % mdev->dev->caps.num_comp_vectors;
+       } else {
                cq->buf_size = sizeof(struct mlx4_cqe);
+               cq->vector   = 0;
+       }
 
        cq->ring = ring;
        cq->is_tx = mode;
@@ -87,7 +90,7 @@ int mlx4_en_activate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq)
        memset(cq->buf, 0, cq->buf_size);
 
        err = mlx4_cq_alloc(mdev->dev, cq->size, &cq->wqres.mtt, &mdev->priv_uar,
-                           cq->wqres.db.dma, &cq->mcq, cq->is_tx);
+                           cq->wqres.db.dma, &cq->mcq, cq->vector, cq->is_tx);
        if (err)
                return err;