diff options
| author | santosh.shilimkar@oracle.com <santosh.shilimkar@oracle.com> | 2016-03-01 15:20:45 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-03-02 14:13:17 -0500 |
| commit | dcfd041c8710320d59fce322fd901bddaf912ae8 (patch) | |
| tree | e2ab557bfa9111e879b64715a21fb001172527a9 /net/rds/ib_send.c | |
| parent | 72f26eee51e89c9d13b3aa199262fad57386f9e5 (diff) | |
| download | blackbird-op-linux-dcfd041c8710320d59fce322fd901bddaf912ae8.tar.gz blackbird-op-linux-dcfd041c8710320d59fce322fd901bddaf912ae8.zip | |
RDS: IB: Remove the RDS_IB_SEND_OP dependency
This helps to combine asynchronous fastreg MR completion handler
with send completion handler.
No functional change.
Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rds/ib_send.c')
| -rw-r--r-- | net/rds/ib_send.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/rds/ib_send.c b/net/rds/ib_send.c index eac30bf486d7..f27d2c82b036 100644 --- a/net/rds/ib_send.c +++ b/net/rds/ib_send.c @@ -195,7 +195,7 @@ void rds_ib_send_init_ring(struct rds_ib_connection *ic) send->s_op = NULL; - send->s_wr.wr_id = i | RDS_IB_SEND_OP; + send->s_wr.wr_id = i; send->s_wr.sg_list = send->s_sge; send->s_wr.ex.imm_data = 0; @@ -263,9 +263,7 @@ void rds_ib_send_cqe_handler(struct rds_ib_connection *ic, struct ib_wc *wc) oldest = rds_ib_ring_oldest(&ic->i_send_ring); - completed = rds_ib_ring_completed(&ic->i_send_ring, - (wc->wr_id & ~RDS_IB_SEND_OP), - oldest); + completed = rds_ib_ring_completed(&ic->i_send_ring, wc->wr_id, oldest); for (i = 0; i < completed; i++) { send = &ic->i_sends[oldest]; |
