IB/ipath: Fix PSN of send WQEs after an RDMA read resend

The PSN of the first packet after an RDMA read is based on the size of
the RDMA read request. This is calculated correctly for the WQE sent
after the first request message but not on subsequent requests if the
RDMA read is resent.

Signed-off-by: Ralph Campbell <ralph.campbell@qlogic.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
index 7b93cda1a4bd..9170710b950d 100644
--- a/drivers/infiniband/hw/ipath/ipath_rc.c
+++ b/drivers/infiniband/hw/ipath/ipath_rc.c
@@ -573,9 +573,8 @@ int ipath_make_rc_req(struct ipath_qp *qp)
                 ohdr->u.rc.reth.length = cpu_to_be32(qp->s_len);
                 qp->s_state = OP(RDMA_READ_REQUEST);
                 hwords += sizeof(ohdr->u.rc.reth) / sizeof(u32);
-                bth2 = qp->s_psn++ & IPATH_PSN_MASK;
-                if (ipath_cmp24(qp->s_psn, qp->s_next_psn) > 0)
-                        qp->s_next_psn = qp->s_psn;
+                bth2 = qp->s_psn & IPATH_PSN_MASK;
+                qp->s_psn = wqe->lpsn + 1;
                 ss = NULL;
                 len = 0;
                 qp->s_cur++;