IB/qib,IB/hfi: Use core common header file

Use common header file structs, defines, and accessors
in the drivers.  The old declarations are removed.

The repositioning of the includes allows for the removal
of hfi1_message_header and replaces its use with ib_header.

Also corrected are two issues with set_armed_to_active():
- The "packet" parameter is now a pointer as it should have been
- The etype is validated to insure that the header is correct

Reviewed-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Reviewed-by: Don Hiatt <don.hiatt@intel.com>
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/infiniband/hw/hfi1/verbs.c b/drivers/infiniband/hw/hfi1/verbs.c
index 92a61c47dedc..d502ba0d743a 100644
--- a/drivers/infiniband/hw/hfi1/verbs.c
+++ b/drivers/infiniband/hw/hfi1/verbs.c
@@ -567,7 +567,7 @@ static inline opcode_handler qp_ok(int opcode, struct hfi1_packet *packet)
 void hfi1_ib_rcv(struct hfi1_packet *packet)
 {
         struct hfi1_ctxtdata *rcd = packet->rcd;
-        struct hfi1_ib_header *hdr = packet->hdr;
+        struct ib_header *hdr = packet->hdr;
         u32 tlen = packet->tlen;
         struct hfi1_pportdata *ppd = rcd->ppd;
         struct hfi1_ibport *ibp = &ppd->ibport_data;
@@ -719,7 +719,7 @@ static void verbs_sdma_complete(
         if (tx->wqe) {
                 hfi1_send_complete(qp, tx->wqe, IB_WC_SUCCESS);
         } else if (qp->ibqp.qp_type == IB_QPT_RC) {
-                struct hfi1_ib_header *hdr;
+                struct ib_header *hdr;
 
                 hdr = &tx->phdr.hdr;
                 hfi1_rc_send_complete(qp, hdr);
@@ -1200,7 +1200,7 @@ static inline send_routine get_send_routine(struct rvt_qp *qp,
 {
         struct hfi1_devdata *dd = dd_from_ibdev(qp->ibqp.device);
         struct hfi1_qp_priv *priv = qp->priv;
-        struct hfi1_ib_header *h = &tx->phdr.hdr;
+        struct ib_header *h = &tx->phdr.hdr;
 
         if (unlikely(!(dd->flags & HFI1_HAS_SEND_DMA)))
                 return dd->process_pio_send;
@@ -1244,8 +1244,8 @@ int hfi1_verbs_send(struct rvt_qp *qp, struct hfi1_pkt_state *ps)
 {
         struct hfi1_devdata *dd = dd_from_ibdev(qp->ibqp.device);
         struct hfi1_qp_priv *priv = qp->priv;
-        struct hfi1_other_headers *ohdr;
-        struct hfi1_ib_header *hdr;
+        struct ib_other_headers *ohdr;
+        struct ib_header *hdr;
         send_routine sr;
         int ret;
         u8 lnh;
@@ -1754,7 +1754,7 @@ void hfi1_cnp_rcv(struct hfi1_packet *packet)
 {
         struct hfi1_ibport *ibp = &packet->rcd->ppd->ibport_data;
         struct hfi1_pportdata *ppd = ppd_from_ibp(ibp);
-        struct hfi1_ib_header *hdr = packet->hdr;
+        struct ib_header *hdr = packet->hdr;
         struct rvt_qp *qp = packet->qp;
         u32 lqpn, rqpn = 0;
         u16 rlid = 0;
@@ -1781,7 +1781,7 @@ void hfi1_cnp_rcv(struct hfi1_packet *packet)
                 return;
         }
 
-        sc5 = hdr2sc((struct hfi1_message_header *)hdr, packet->rhf);
+        sc5 = hdr2sc(hdr, packet->rhf);
         sl = ibp->sc_to_sl[sc5];
         lqpn = qp->ibqp.qp_num;