1 files changed, 20 insertions, 11 deletions

diff --git a/drivers/infiniband/hw/i40iw/i40iw_cm.c b/drivers/infiniband/hw/i40iw/i40iw_cm.c
index 493d6ef3d2d5..77870f9e1736 100644
--- a/drivers/infiniband/hw/i40iw/i40iw_cm.c
+++ b/drivers/infiniband/hw/i40iw/i40iw_cm.c
@@ -1043,7 +1043,7 @@ negotiate_done:
  * i40iw_schedule_cm_timer
  * @@cm_node: connection's node
  * @sqbuf: buffer to send
- * @type: if it es send ot close
+ * @type: if it is send or close
  * @send_retrans: if rexmits to be done
  * @close_when_complete: is cm_node to be removed
  *
@@ -1067,7 +1067,8 @@ int i40iw_schedule_cm_timer(struct i40iw_cm_node *cm_node,
 
         new_send = kzalloc(sizeof(*new_send), GFP_ATOMIC);
         if (!new_send) {
-                i40iw_free_sqbuf(vsi, (void *)sqbuf);
+                if (type != I40IW_TIMER_TYPE_CLOSE)
+                        i40iw_free_sqbuf(vsi, (void *)sqbuf);
                 return -ENOMEM;
         }
         new_send->retrycount = I40IW_DEFAULT_RETRYS;
@@ -1082,7 +1083,6 @@ int i40iw_schedule_cm_timer(struct i40iw_cm_node *cm_node,
                 new_send->timetosend += (HZ / 10);
                 if (cm_node->close_entry) {
                         kfree(new_send);
-                        i40iw_free_sqbuf(vsi, (void *)sqbuf);
                         i40iw_pr_err("already close entry\n");
                         return -EINVAL;
                 }
@@ -2947,8 +2947,6 @@ static struct i40iw_cm_node *i40iw_create_cm_node(
                         loopback_remotenode->tcp_cntxt.snd_wnd = cm_node->tcp_cntxt.rcv_wnd;
                         cm_node->tcp_cntxt.snd_wscale = loopback_remotenode->tcp_cntxt.rcv_wscale;
                         loopback_remotenode->tcp_cntxt.snd_wscale = cm_node->tcp_cntxt.rcv_wscale;
-                        loopback_remotenode->state = I40IW_CM_STATE_MPAREQ_RCVD;
-                        i40iw_create_event(loopback_remotenode, I40IW_CM_EVENT_MPA_REQ);
                 }
                 return cm_node;
         }
@@ -3689,11 +3687,16 @@ int i40iw_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
         cm_id->add_ref(cm_id);
         i40iw_add_ref(&iwqp->ibqp);
 
-        i40iw_send_cm_event(cm_node, cm_id, IW_CM_EVENT_ESTABLISHED, 0);
-
         attr.qp_state = IB_QPS_RTS;
         cm_node->qhash_set = false;
         i40iw_modify_qp(&iwqp->ibqp, &attr, IB_QP_STATE, NULL);
+
+        cm_node->accelerated = 1;
+        status =
+                i40iw_send_cm_event(cm_node, cm_id, IW_CM_EVENT_ESTABLISHED, 0);
+        if (status)
+                i40iw_debug(dev, I40IW_DEBUG_CM, "error sending cm event - ESTABLISHED\n");
+
         if (cm_node->loopbackpartner) {
                 cm_node->loopbackpartner->pdata.size = conn_param->private_data_len;
 
@@ -3704,7 +3707,6 @@ int i40iw_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
                 i40iw_create_event(cm_node->loopbackpartner, I40IW_CM_EVENT_CONNECTED);
         }
 
-        cm_node->accelerated = 1;
         if (cm_node->accept_pend) {
                 atomic_dec(&cm_node->listener->pend_accepts_cnt);
                 cm_node->accept_pend = 0;
@@ -3864,6 +3866,12 @@ int i40iw_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
                         goto err;
         }
 
+        if (cm_node->loopbackpartner) {
+                cm_node->loopbackpartner->state = I40IW_CM_STATE_MPAREQ_RCVD;
+                i40iw_create_event(cm_node->loopbackpartner,
+                                   I40IW_CM_EVENT_MPA_REQ);
+        }
+
         i40iw_debug(cm_node->dev,
                     I40IW_DEBUG_CM,
                     "Api - connect(): port=0x%04x, cm_node=%p, cm_id = %p.\n",
@@ -4044,9 +4052,6 @@ static void i40iw_cm_event_connected(struct i40iw_cm_event *event)
         dev->iw_priv_qp_ops->qp_send_rtt(&iwqp->sc_qp, read0);
         if (iwqp->page)
                 kunmap(iwqp->page);
-        status = i40iw_send_cm_event(cm_node, cm_id, IW_CM_EVENT_CONNECT_REPLY, 0);
-        if (status)
-                i40iw_pr_err("send cm event\n");
 
         memset(&attr, 0, sizeof(attr));
         attr.qp_state = IB_QPS_RTS;
@@ -4054,6 +4059,10 @@ static void i40iw_cm_event_connected(struct i40iw_cm_event *event)
         i40iw_modify_qp(&iwqp->ibqp, &attr, IB_QP_STATE, NULL);
 
         cm_node->accelerated = 1;
+        status = i40iw_send_cm_event(cm_node, cm_id, IW_CM_EVENT_CONNECT_REPLY,
+                                     0);
+        if (status)
+                i40iw_debug(dev, I40IW_DEBUG_CM, "error sending cm event - CONNECT_REPLY\n");
 
         return;