IB/rdmavt, hfi1, qib: Enhance rdmavt and hfi1 to use 32 bit lids

[linux-2.6-microblaze.git] / drivers / infiniband / hw / hfi1 / verbs.c

diff --git a/drivers/infiniband/hw/hfi1/verbs.c b/drivers/infiniband/hw/hfi1/verbs.c
index 18b2727..83565e5 100644 (file)
--- a/drivers/infiniband/hw/hfi1/verbs.c
+++ b/drivers/infiniband/hw/hfi1/verbs.c
@@ -1394,7 +1394,7 @@ static int query_port(struct rvt_dev_info *rdi, u8 port_num,
        struct hfi1_ibdev *verbs_dev = dev_from_rdi(rdi);
        struct hfi1_devdata *dd = dd_from_dev(verbs_dev);
        struct hfi1_pportdata *ppd = &dd->pport[port_num - 1];
-       u16 lid = ppd->lid;
+       u32 lid = ppd->lid;
 
        /* props being zeroed by the caller, avoid zeroing it here */
        props->lid = lid ? lid : 0;
@@ -1555,27 +1555,6 @@ static void hfi1_notify_new_ah(struct ib_device *ibdev,
                ah->log_pmtu = ilog2(dd->vld[ah->vl].mtu);
 }
 
-struct ib_ah *hfi1_create_qp0_ah(struct hfi1_ibport *ibp, u16 dlid)
-{
-       struct rdma_ah_attr attr;
-       struct ib_ah *ah = ERR_PTR(-EINVAL);
-       struct rvt_qp *qp0;
-       struct hfi1_pportdata *ppd = ppd_from_ibp(ibp);
-       struct hfi1_devdata *dd = dd_from_ppd(ppd);
-       u8 port_num = ppd->port;
-
-       memset(&attr, 0, sizeof(attr));
-       attr.type = rdma_ah_find_type(&dd->verbs_dev.rdi.ibdev, port_num);
-       rdma_ah_set_dlid(&attr, dlid);
-       rdma_ah_set_port_num(&attr, ppd_from_ibp(ibp)->port);
-       rcu_read_lock();
-       qp0 = rcu_dereference(ibp->rvp.qp[0]);
-       if (qp0)
-               ah = rdma_create_ah(qp0->ibqp.pd, &attr);
-       rcu_read_unlock();
-       return ah;
-}
-
 /**
  * hfi1_get_npkeys - return the size of the PKEY table for context 0
  * @dd: the hfi1_ib device