Merge branch 'fixes-base' into fixes

[deliverable/linux.git] / net / rds / ib_send.c

diff --git a/net/rds/ib_send.c b/net/rds/ib_send.c
index eac30bf486d747ce5a78f001de2d65cc5fc7d891..f27d2c82b036f207a06b3b54193e43eded88757f 100644 (file)
--- 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];