Skip to content

Commit

Permalink
IB/ipath: Set M bit in BTH according to IB spec
Browse files Browse the repository at this point in the history
According to chapter 17.2.8.1.1, QPs start in the migrated state and
should send packets with the M bit set in the BTH.

Signed-off-by: Ralph Campbell <ralph.campbell@qlogic.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
  • Loading branch information
Ralph Campbell authored and Roland Dreier committed Jul 10, 2007
1 parent 6d2fad0 commit 1dd6a1b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions drivers/infiniband/hw/ipath/ipath_rc.c
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ static int ipath_make_rc_ack(struct ipath_qp *qp,
}
qp->s_hdrwords = hwords;
qp->s_cur_size = len;
*bth0p = bth0;
*bth0p = bth0 | (1 << 22); /* Set M bit */
*bth2p = bth2;
return 1;

Expand Down Expand Up @@ -240,7 +240,7 @@ int ipath_make_rc_req(struct ipath_qp *qp,

/* header size in 32-bit words LRH+BTH = (8+12)/4. */
hwords = 5;
bth0 = 0;
bth0 = 1 << 22; /* Set M bit */

/* Send a request. */
wqe = get_swqe_ptr(qp, qp->s_cur);
Expand Down Expand Up @@ -604,7 +604,7 @@ static void send_rc_ack(struct ipath_qp *qp)
}
/* read pkey_index w/o lock (its atomic) */
bth0 = ipath_get_pkey(dev->dd, qp->s_pkey_index) |
OP(ACKNOWLEDGE) << 24;
(OP(ACKNOWLEDGE) << 24) | (1 << 22);
if (qp->r_nak_state)
ohdr->u.aeth = cpu_to_be32((qp->r_msn & IPATH_MSN_MASK) |
(qp->r_nak_state <<
Expand Down
2 changes: 1 addition & 1 deletion drivers/infiniband/hw/ipath/ipath_uc.c
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ int ipath_make_uc_req(struct ipath_qp *qp,

/* header size in 32-bit words LRH+BTH = (8+12)/4. */
hwords = 5;
bth0 = 0;
bth0 = 1 << 22; /* Set M bit */

/* Get the next send request. */
wqe = get_swqe_ptr(qp, qp->s_last);
Expand Down

0 comments on commit 1dd6a1b

Please sign in to comment.