diff options
Diffstat (limited to 'drivers/infiniband/hw/ipath/ipath_ruc.c')
-rw-r--r-- | drivers/infiniband/hw/ipath/ipath_ruc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c index 99c0652d49dc..772bc59fb85c 100644 --- a/drivers/infiniband/hw/ipath/ipath_ruc.c +++ b/drivers/infiniband/hw/ipath/ipath_ruc.c | |||
@@ -32,7 +32,7 @@ | |||
32 | */ | 32 | */ |
33 | 33 | ||
34 | #include "ipath_verbs.h" | 34 | #include "ipath_verbs.h" |
35 | #include "ips_common.h" | 35 | #include "ipath_common.h" |
36 | 36 | ||
37 | /* | 37 | /* |
38 | * Convert the AETH RNR timeout code into the number of milliseconds. | 38 | * Convert the AETH RNR timeout code into the number of milliseconds. |
@@ -632,7 +632,7 @@ again: | |||
632 | /* Sending responses has higher priority over sending requests. */ | 632 | /* Sending responses has higher priority over sending requests. */ |
633 | if (qp->s_ack_state != IB_OPCODE_RC_ACKNOWLEDGE && | 633 | if (qp->s_ack_state != IB_OPCODE_RC_ACKNOWLEDGE && |
634 | (bth0 = ipath_make_rc_ack(qp, ohdr, pmtu)) != 0) | 634 | (bth0 = ipath_make_rc_ack(qp, ohdr, pmtu)) != 0) |
635 | bth2 = qp->s_ack_psn++ & IPS_PSN_MASK; | 635 | bth2 = qp->s_ack_psn++ & IPATH_PSN_MASK; |
636 | else if (!((qp->ibqp.qp_type == IB_QPT_RC) ? | 636 | else if (!((qp->ibqp.qp_type == IB_QPT_RC) ? |
637 | ipath_make_rc_req(qp, ohdr, pmtu, &bth0, &bth2) : | 637 | ipath_make_rc_req(qp, ohdr, pmtu, &bth0, &bth2) : |
638 | ipath_make_uc_req(qp, ohdr, pmtu, &bth0, &bth2))) { | 638 | ipath_make_uc_req(qp, ohdr, pmtu, &bth0, &bth2))) { |
@@ -651,12 +651,12 @@ again: | |||
651 | /* Construct the header. */ | 651 | /* Construct the header. */ |
652 | extra_bytes = (4 - qp->s_cur_size) & 3; | 652 | extra_bytes = (4 - qp->s_cur_size) & 3; |
653 | nwords = (qp->s_cur_size + extra_bytes) >> 2; | 653 | nwords = (qp->s_cur_size + extra_bytes) >> 2; |
654 | lrh0 = IPS_LRH_BTH; | 654 | lrh0 = IPATH_LRH_BTH; |
655 | if (unlikely(qp->remote_ah_attr.ah_flags & IB_AH_GRH)) { | 655 | if (unlikely(qp->remote_ah_attr.ah_flags & IB_AH_GRH)) { |
656 | qp->s_hdrwords += ipath_make_grh(dev, &qp->s_hdr.u.l.grh, | 656 | qp->s_hdrwords += ipath_make_grh(dev, &qp->s_hdr.u.l.grh, |
657 | &qp->remote_ah_attr.grh, | 657 | &qp->remote_ah_attr.grh, |
658 | qp->s_hdrwords, nwords); | 658 | qp->s_hdrwords, nwords); |
659 | lrh0 = IPS_LRH_GRH; | 659 | lrh0 = IPATH_LRH_GRH; |
660 | } | 660 | } |
661 | lrh0 |= qp->remote_ah_attr.sl << 4; | 661 | lrh0 |= qp->remote_ah_attr.sl << 4; |
662 | qp->s_hdr.lrh[0] = cpu_to_be16(lrh0); | 662 | qp->s_hdr.lrh[0] = cpu_to_be16(lrh0); |