1 files changed, 41 insertions, 13 deletions

diff --git a/drivers/infiniband/hw/mthca/mthca_provider.h b/drivers/infiniband/hw/mthca/mthca_provider.h
index 1d032791cc8b..bcd4b01a339c 100644
--- a/drivers/infiniband/hw/mthca/mthca_provider.h
+++ b/drivers/infiniband/hw/mthca/mthca_provider.h
@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2004 Topspin Communications.  All rights reserved.
  * Copyright (c) 2005 Cisco Systems.  All rights reserved.
+ * Copyright (c) 2005 Mellanox Technologies. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -36,8 +37,8 @@
 #ifndef MTHCA_PROVIDER_H
 #define MTHCA_PROVIDER_H
 
-#include <ib_verbs.h>
-#include <ib_pack.h>
+#include <rdma/ib_verbs.h>
+#include <rdma/ib_pack.h>
 
 #define MTHCA_MPT_FLAG_ATOMIC        (1 << 14)
 #define MTHCA_MPT_FLAG_REMOTE_WRITE  (1 << 13)
@@ -50,6 +51,11 @@ struct mthca_buf_list {
         DECLARE_PCI_UNMAP_ADDR(mapping)
 };
 
+union mthca_buf {
+        struct mthca_buf_list direct;
+        struct mthca_buf_list *page_list;
+};
+
 struct mthca_uar {
         unsigned long pfn;
         int           index;
@@ -181,19 +187,39 @@ struct mthca_cq {
 
         /* Next fields are Arbel only */
         int                    set_ci_db_index;
-        u32                   *set_ci_db;
+        __be32                *set_ci_db;
         int                    arm_db_index;
-        u32                   *arm_db;
+        __be32                *arm_db;
         int                    arm_sn;
 
-        union {
-                struct mthca_buf_list direct;
-                struct mthca_buf_list *page_list;
-        }                      queue;
+        union mthca_buf        queue;
         struct mthca_mr        mr;
         wait_queue_head_t      wait;
 };
 
+struct mthca_srq {
+        struct ib_srq           ibsrq;
+        spinlock_t              lock;
+        atomic_t                refcount;
+        int                     srqn;
+        int                     max;
+        int                     max_gs;
+        int                     wqe_shift;
+        int                     first_free;
+        int                     last_free;
+        u16                     counter;  /* Arbel only */
+        int                     db_index; /* Arbel only */
+        __be32                 *db;       /* Arbel only */
+        void                   *last;
+
+        int                     is_direct;
+        u64                    *wrid;
+        union mthca_buf         queue;
+        struct mthca_mr         mr;
+
+        wait_queue_head_t       wait;
+};
+
 struct mthca_wq {
         spinlock_t lock;
         int        max;
@@ -206,7 +232,7 @@ struct mthca_wq {
         int        wqe_shift;
 
         int        db_index;    /* Arbel only */
-        u32       *db;
+        __be32    *db;
 };
 
 struct mthca_qp {
@@ -227,10 +253,7 @@ struct mthca_qp {
         int                    send_wqe_offset;
 
         u64                   *wrid;
-        union {
-                struct mthca_buf_list direct;
-                struct mthca_buf_list *page_list;
-        }                      queue;
+        union mthca_buf        queue;
 
         wait_queue_head_t      wait;
 };
@@ -277,6 +300,11 @@ static inline struct mthca_cq *to_mcq(struct ib_cq *ibcq)
         return container_of(ibcq, struct mthca_cq, ibcq);
 }
 
+static inline struct mthca_srq *to_msrq(struct ib_srq *ibsrq)
+{
+        return container_of(ibsrq, struct mthca_srq, ibsrq);
+}
+
 static inline struct mthca_qp *to_mqp(struct ib_qp *ibqp)
 {
         return container_of(ibqp, struct mthca_qp, ibqp);