3 files changed, 10 insertions, 4 deletions

diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
index 649335a03312..5eace995836d 100644
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
@@ -1100,7 +1100,9 @@ int ib_post_send_mad(struct ib_mad_send_buf *send_buf,
                 mad_send_wr->tid = ((struct ib_mad_hdr *) send_buf->mad)->tid;
                 /* Timeout will be updated after send completes */
                 mad_send_wr->timeout = msecs_to_jiffies(send_buf->timeout_ms);
-                mad_send_wr->retries = send_buf->retries;
+                mad_send_wr->max_retries = send_buf->retries;
+                mad_send_wr->retries_left = send_buf->retries;
+                send_buf->retries = 0;
                 /* Reference for work request to QP + response */
                 mad_send_wr->refcount = 1 + (mad_send_wr->timeout > 0);
                 mad_send_wr->status = IB_WC_SUCCESS;
@@ -2436,9 +2438,12 @@ static int retry_send(struct ib_mad_send_wr_private *mad_send_wr)
 {
         int ret;
 
-        if (!mad_send_wr->retries--)
+        if (!mad_send_wr->retries_left)
                 return -ETIMEDOUT;
 
+        mad_send_wr->retries_left--;
+        mad_send_wr->send_buf.retries++;
+
         mad_send_wr->timeout = msecs_to_jiffies(mad_send_wr->send_buf.timeout_ms);
 
         if (mad_send_wr->mad_agent_priv->agent.rmpp_version) {
diff --git a/drivers/infiniband/core/mad_priv.h b/drivers/infiniband/core/mad_priv.h
index 9be5cc00a3a9..8b75010016ec 100644
--- a/drivers/infiniband/core/mad_priv.h
+++ b/drivers/infiniband/core/mad_priv.h
@@ -131,7 +131,8 @@ struct ib_mad_send_wr_private {
         struct ib_sge sg_list[IB_MAD_SEND_REQ_MAX_SG];
         __be64 tid;
         unsigned long timeout;
-        int retries;
+        int max_retries;
+        int retries_left;
         int retry;
         int refcount;
         enum ib_wc_status status;
diff --git a/drivers/infiniband/core/mad_rmpp.c b/drivers/infiniband/core/mad_rmpp.c
index d43bc62005b3..a5e2a310f312 100644
--- a/drivers/infiniband/core/mad_rmpp.c
+++ b/drivers/infiniband/core/mad_rmpp.c
@@ -684,7 +684,7 @@ static void process_rmpp_ack(struct ib_mad_agent_private *agent,
 
         if (seg_num > mad_send_wr->last_ack) {
                 adjust_last_ack(mad_send_wr, seg_num);
-                mad_send_wr->retries = mad_send_wr->send_buf.retries;
+                mad_send_wr->retries_left = mad_send_wr->max_retries;
         }
         mad_send_wr->newwin = newwin;
         if (mad_send_wr->last_ack == mad_send_wr->send_buf.seg_count) {