Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / include / linux / mlx4 / device.h

diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
index 371086fd946f3f13a7cbeecab10354caae5cb15f..8f659cc2996026eb26c9c1649330be152388f2c7 100644 (file)
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@ -206,6 +206,7 @@ struct mlx4_caps {
        int                     reserved_cqs;
        int                     num_eqs;
        int                     reserved_eqs;
+       int                     num_comp_vectors;
        int                     num_mpts;
        int                     num_mtt_segs;
        int                     fmr_reserved_mtts;
@@ -328,6 +329,7 @@ struct mlx4_cq {
        int                     arm_sn;
 
        int                     cqn;
+       unsigned                vector;
 
        atomic_t                refcount;
        struct completion       free;
@@ -437,7 +439,7 @@ void mlx4_free_hwq_res(struct mlx4_dev *mdev, struct mlx4_hwq_resources *wqres,
 
 int mlx4_cq_alloc(struct mlx4_dev *dev, int nent, struct mlx4_mtt *mtt,
                  struct mlx4_uar *uar, u64 db_rec, struct mlx4_cq *cq,
-                 int collapsed);
+                 unsigned vector, int collapsed);
 void mlx4_cq_free(struct mlx4_dev *dev, struct mlx4_cq *cq);
 
 int mlx4_qp_reserve_range(struct mlx4_dev *dev, int cnt, int align, int *base);