IB/qib: Remove qp and mr functionality from qib

[linux-2.6-microblaze.git] / drivers / infiniband / hw / qib / qib_ud.c

diff --git a/drivers/infiniband/hw/qib/qib_ud.c b/drivers/infiniband/hw/qib/qib_ud.c
index 682403a..1d9d037 100644 (file)
--- a/drivers/infiniband/hw/qib/qib_ud.c
+++ b/drivers/infiniband/hw/qib/qib_ud.c
@@ -47,15 +47,15 @@
  * Note that the receive interrupt handler may be calling qib_ud_rcv()
  * while this is being called.
  */
-static void qib_ud_loopback(struct qib_qp *sqp, struct qib_swqe *swqe)
+static void qib_ud_loopback(struct rvt_qp *sqp, struct rvt_swqe *swqe)
 {
        struct qib_ibport *ibp = to_iport(sqp->ibqp.device, sqp->port_num);
        struct qib_pportdata *ppd;
-       struct qib_qp *qp;
+       struct rvt_qp *qp;
        struct ib_ah_attr *ah_attr;
        unsigned long flags;
-       struct qib_sge_state ssge;
-       struct qib_sge *sge;
+       struct rvt_sge_state ssge;
+       struct rvt_sge *sge;
        struct ib_wc wc;
        u32 length;
        enum ib_qp_type sqptype, dqptype;
@@ -190,7 +190,7 @@ static void qib_ud_loopback(struct qib_qp *sqp, struct qib_swqe *swqe)
                        if (--ssge.num_sge)
                                *sge = *ssge.sg_list++;
                } else if (sge->length == 0 && sge->mr->lkey) {
-                       if (++sge->n >= QIB_SEGSZ) {
+                       if (++sge->n >= RVT_SEGSZ) {
                                if (++sge->m >= sge->mr->mapsz)
                                        break;
                                sge->n = 0;
@@ -233,14 +233,14 @@ drop:
  *
  * Return 1 if constructed; otherwise, return 0.
  */
-int qib_make_ud_req(struct qib_qp *qp)
+int qib_make_ud_req(struct rvt_qp *qp)
 {
        struct qib_qp_priv *priv = qp->priv;
        struct qib_other_headers *ohdr;
        struct ib_ah_attr *ah_attr;
        struct qib_pportdata *ppd;
        struct qib_ibport *ibp;
-       struct qib_swqe *wqe;
+       struct rvt_swqe *wqe;
        unsigned long flags;
        u32 nwords;
        u32 extra_bytes;
@@ -429,7 +429,7 @@ static unsigned qib_lookup_pkey(struct qib_ibport *ibp, u16 pkey)
  * Called at interrupt level.
  */
 void qib_ud_rcv(struct qib_ibport *ibp, struct qib_ib_header *hdr,
-               int has_grh, void *data, u32 tlen, struct qib_qp *qp)
+               int has_grh, void *data, u32 tlen, struct rvt_qp *qp)
 {
        struct qib_other_headers *ohdr;
        int opcode;