Merge branch 'linus/master' into rdma.git for-next

[linux-2.6-block.git] / net / smc / smc_tx.c

diff --git a/net/smc/smc_tx.c b/net/smc/smc_tx.c
index 2f5e324e54b97a0712bc7d07c5de9307901e3b08..d8366ed517576ba7f258ad74f0cf91f7fd92d7e0 100644 (file)
--- a/net/smc/smc_tx.c
+++ b/net/smc/smc_tx.c
@@ -270,7 +270,6 @@ static int smc_tx_rdma_write(struct smc_connection *conn, int peer_rmbe_offset,
                             int num_sges, struct ib_sge sges[])
 {
        struct smc_link_group *lgr = conn->lgr;
-       struct ib_send_wr *failed_wr = NULL;
        struct ib_rdma_wr rdma_wr;
        struct smc_link *link;
        int rc;
@@ -288,7 +287,7 @@ static int smc_tx_rdma_write(struct smc_connection *conn, int peer_rmbe_offset,
                /* offset within RMBE */
                peer_rmbe_offset;
        rdma_wr.rkey = lgr->rtokens[conn->rtoken_idx][SMC_SINGLE_LINK].rkey;
-       rc = ib_post_send(link->roce_qp, &rdma_wr.wr, &failed_wr);
+       rc = ib_post_send(link->roce_qp, &rdma_wr.wr, NULL);
        if (rc) {
                conn->local_tx_ctrl.conn_state_flags.peer_conn_abort = 1;
                smc_lgr_terminate(lgr);