--- ./source/private_module/core/cm.c	2018-03-28 09:52:09.000000000 +0000
+++ ./source/private_module/core/cm.c.hotpatch	2018-08-28 11:41:06.000000000 +0000
@@ -3426,7 +3426,7 @@
 	state = (enum ib_cm_state) (unsigned long) msg->context[1];
 	if (msg != cm_id_priv->msg || state != cm_id_priv->id.state)
 		goto discard;
-
+	cm_id_priv->msg = NULL;
 	switch (state) {
 	case IB_CM_REQ_SENT:
 	case IB_CM_MRA_REQ_RCVD:
@@ -3527,10 +3527,10 @@
 	default:
 		if (cm_id_priv && msg->context[1])
 		{      
-			spin_lock_irq(&cm_id_priv->lock);
+			/*spin_lock_irq(&cm_id_priv->lock);
 			if (cm_id_priv->msg == msg)
 				cm_id_priv->msg = NULL;
-			spin_unlock_irq(&cm_id_priv->lock);
+			spin_unlock_irq(&cm_id_priv->lock);*/
 			cm_process_send_error(msg, mad_send_wc->status);
 		}
 		else
