aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/infiniband/hw/ipath/ipath_rc.c52
1 files changed, 26 insertions, 26 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
index 0ca89af3e10d..720cb3ae1fc3 100644
--- a/drivers/infiniband/hw/ipath/ipath_rc.c
+++ b/drivers/infiniband/hw/ipath/ipath_rc.c
@@ -1053,32 +1053,32 @@ static inline void ipath_rc_rcv_resp(struct ipath_ibdev *dev,
1053 goto ack_done; 1053 goto ack_done;
1054 } 1054 }
1055 rdma_read: 1055 rdma_read:
1056 if (unlikely(qp->s_state != OP(RDMA_READ_REQUEST))) 1056 if (unlikely(qp->s_state != OP(RDMA_READ_REQUEST)))
1057 goto ack_done; 1057 goto ack_done;
1058 if (unlikely(tlen != (hdrsize + pmtu + 4))) 1058 if (unlikely(tlen != (hdrsize + pmtu + 4)))
1059 goto ack_done; 1059 goto ack_done;
1060 if (unlikely(pmtu >= qp->s_len)) 1060 if (unlikely(pmtu >= qp->s_len))
1061 goto ack_done; 1061 goto ack_done;
1062 /* We got a response so update the timeout. */ 1062 /* We got a response so update the timeout. */
1063 if (unlikely(qp->s_last == qp->s_tail || 1063 if (unlikely(qp->s_last == qp->s_tail ||
1064 get_swqe_ptr(qp, qp->s_last)->wr.opcode != 1064 get_swqe_ptr(qp, qp->s_last)->wr.opcode !=
1065 IB_WR_RDMA_READ)) 1065 IB_WR_RDMA_READ))
1066 goto ack_done; 1066 goto ack_done;
1067 spin_lock(&dev->pending_lock); 1067 spin_lock(&dev->pending_lock);
1068 if (qp->s_rnr_timeout == 0 && !list_empty(&qp->timerwait)) 1068 if (qp->s_rnr_timeout == 0 && !list_empty(&qp->timerwait))
1069 list_move_tail(&qp->timerwait, 1069 list_move_tail(&qp->timerwait,
1070 &dev->pending[dev->pending_index]); 1070 &dev->pending[dev->pending_index]);
1071 spin_unlock(&dev->pending_lock); 1071 spin_unlock(&dev->pending_lock);
1072 /* 1072 /*
1073 * Update the RDMA receive state but do the copy w/o holding the 1073 * Update the RDMA receive state but do the copy w/o holding the
1074 * locks and blocking interrupts. XXX Yet another place that 1074 * locks and blocking interrupts. XXX Yet another place that
1075 * affects relaxed RDMA order since we don't want s_sge modified. 1075 * affects relaxed RDMA order since we don't want s_sge modified.
1076 */ 1076 */
1077 qp->s_len -= pmtu; 1077 qp->s_len -= pmtu;
1078 qp->s_last_psn = psn; 1078 qp->s_last_psn = psn;
1079 spin_unlock_irqrestore(&qp->s_lock, flags); 1079 spin_unlock_irqrestore(&qp->s_lock, flags);
1080 ipath_copy_sge(&qp->s_sge, data, pmtu); 1080 ipath_copy_sge(&qp->s_sge, data, pmtu);
1081 goto bail; 1081 goto bail;
1082 1082
1083 case OP(RDMA_READ_RESPONSE_LAST): 1083 case OP(RDMA_READ_RESPONSE_LAST):
1084 /* ACKs READ req. */ 1084 /* ACKs READ req. */