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

[linux-2.6-omap-h63xx.git] / drivers / infiniband / hw / mthca / mthca_dev.h

diff --git a/drivers/infiniband/hw/mthca/mthca_dev.h b/drivers/infiniband/hw/mthca/mthca_dev.h
index b7e42efaf43df30a5981503af8d80f3111a17038..7bbdd1f4e6c708c14ee3dc0ab031c64b24140779 100644 (file)
--- a/drivers/infiniband/hw/mthca/mthca_dev.h
+++ b/drivers/infiniband/hw/mthca/mthca_dev.h
@@ -60,13 +60,12 @@
 enum {
        MTHCA_FLAG_DDR_HIDDEN = 1 << 1,
        MTHCA_FLAG_SRQ        = 1 << 2,
-       MTHCA_FLAG_MSI        = 1 << 3,
-       MTHCA_FLAG_MSI_X      = 1 << 4,
-       MTHCA_FLAG_NO_LAM     = 1 << 5,
-       MTHCA_FLAG_FMR        = 1 << 6,
-       MTHCA_FLAG_MEMFREE    = 1 << 7,
-       MTHCA_FLAG_PCIE       = 1 << 8,
-       MTHCA_FLAG_SINAI_OPT  = 1 << 9
+       MTHCA_FLAG_MSI_X      = 1 << 3,
+       MTHCA_FLAG_NO_LAM     = 1 << 4,
+       MTHCA_FLAG_FMR        = 1 << 5,
+       MTHCA_FLAG_MEMFREE    = 1 << 6,
+       MTHCA_FLAG_PCIE       = 1 << 7,
+       MTHCA_FLAG_SINAI_OPT  = 1 << 8
 };
 
 enum {
@@ -83,7 +82,7 @@ enum {
        MTHCA_QP_CONTEXT_SIZE = 0x200,
        MTHCA_RDB_ENTRY_SIZE  =  0x20,
        MTHCA_AV_SIZE         =  0x20,
-       MTHCA_MGM_ENTRY_SIZE  =  0x40,
+       MTHCA_MGM_ENTRY_SIZE  = 0x100,
 
        /* Arbel FW gives us these, but we need them for Tavor */
        MTHCA_MPT_ENTRY_SIZE  =  0x40,
@@ -495,8 +494,8 @@ void mthca_unmap_eq_icm(struct mthca_dev *dev);
 
 int mthca_poll_cq(struct ib_cq *ibcq, int num_entries,
                  struct ib_wc *entry);
-int mthca_tavor_arm_cq(struct ib_cq *cq, enum ib_cq_notify notify);
-int mthca_arbel_arm_cq(struct ib_cq *cq, enum ib_cq_notify notify);
+int mthca_tavor_arm_cq(struct ib_cq *cq, enum ib_cq_notify_flags flags);
+int mthca_arbel_arm_cq(struct ib_cq *cq, enum ib_cq_notify_flags flags);
 int mthca_init_cq(struct mthca_dev *dev, int nent,
                  struct mthca_ucontext *ctx, u32 pdn,
                  struct mthca_cq *cq);