Merge branch 'wr-cleanup' of git://git.infradead.org/users/hch/rdma into wr-cleanup

Signed-off-by: Doug Ledford <dledford@redhat.com>
Conflicts:
	drivers/infiniband/ulp/isert/ib_isert.c - Commit 4366b19ca5eb
	(iser-target: Change the recv buffers posting logic) changed the
	logic in isert_put_datain() and had to be hand merged

diff --cc drivers/infiniband/ulp/isert/ib_isert.c
index aa59037d75040b7d6e1126bb620339c1c603bc89,02c4c0b4569d862811ac135c1e2cf35915da3a40..70d55d381515f608d9917afe6cf44561b6b97009
--- 1/drivers/infiniband/ulp/isert/ib_isert.c
--- 2/drivers/infiniband/ulp/isert/ib_isert.c
+++ b/drivers/infiniband/ulp/isert/ib_isert.c
@@@ -2967,17 -2948,11 +2967,17 @@@ isert_put_datain(struct iscsi_conn *con
                isert_init_tx_hdrs(isert_conn, &isert_cmd->tx_desc);
                isert_init_send_wr(isert_conn, isert_cmd,
                                   &isert_cmd->tx_desc.send_wr);
-               isert_cmd->rdma_wr.s_send_wr.next = &isert_cmd->tx_desc.send_wr;
-               wr->send_wr_num += 1;
+               isert_cmd->rdma_wr.s_rdma_wr.wr.next = &isert_cmd->tx_desc.send_wr;
+               wr->rdma_wr_num += 1;
 +
 +              rc = isert_post_recv(isert_conn, isert_cmd->rx_desc);
 +              if (rc) {
 +                      isert_err("ib_post_recv failed with %d\n", rc);
 +                      return rc;
 +              }
        }
  
-       rc = ib_post_send(isert_conn->qp, wr->send_wr, &wr_failed);
+       rc = ib_post_send(isert_conn->qp, &wr->rdma_wr->wr, &wr_failed);
        if (rc)
                isert_warn("ib_post_send() failed for IB_WR_RDMA_WRITE\n");
  

diff --cc drivers/infiniband/ulp/isert/ib_isert.h
Simple merge