svn commit: r322157 - stable/9/sys/ofed/drivers/infiniband/core

[Hans Petter Selasky]

Author: hselasky
Date: Mon Aug  7 12:59:32 2017
New Revision: 322157
URL: https://svnweb.freebsd.org/changeset/base/322157

Log:
  MFC r321986:
  Change reject message type when destroying cm_id in ibore.
  
  This patch fixes an interopability issue between FreeBSD and non-FreeBSD
  systems when the connection establishment is aborted. Refer to the
  initial commit in Linux, drivers/infiniband/core/cm.c,
  for a more detailed description.
  
  Obtained from:	Linux
  Sponsored by:	Mellanox Technologies

Modified:
  stable/9/sys/ofed/drivers/infiniband/core/cm.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/ofed/drivers/infiniband/core/cm.c
==============================================================================
--- stable/9/sys/ofed/drivers/infiniband/core/cm.c	Mon Aug  7 12:58:31 2017	(r322156)
+++ stable/9/sys/ofed/drivers/infiniband/core/cm.c	Mon Aug  7 12:59:32 2017	(r322157)
@@ -870,6 +870,7 @@ retest:
 		cm_reject_sidr_req(cm_id_priv, IB_SIDR_REJECT);
 		break;
 	case IB_CM_REQ_SENT:
+	case IB_CM_MRA_REQ_RCVD:
 		ib_cancel_mad(cm_id_priv->av.port->mad_agent, cm_id_priv->msg);
 		spin_unlock_irq(&cm_id_priv->lock);
 		ib_send_cm_rej(cm_id, IB_CM_REJ_TIMEOUT,
@@ -888,7 +889,6 @@ retest:
 				       NULL, 0, NULL, 0);
 		}
 		break;
-	case IB_CM_MRA_REQ_RCVD:
 	case IB_CM_REP_SENT:
 	case IB_CM_MRA_REP_RCVD:
 		ib_cancel_mad(cm_id_priv->av.port->mad_agent, cm_id_priv->msg);