Author: hselasky
Date: Thu Aug  3 09:31:10 2017
New Revision: 321986
URL: https://svnweb.freebsd.org/changeset/base/321986

Log:
  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
  MFC after:    3 days
  Sponsored by: Mellanox Technologies

Modified:
  head/sys/ofed/drivers/infiniband/core/cm.c

Modified: head/sys/ofed/drivers/infiniband/core/cm.c
==============================================================================
--- head/sys/ofed/drivers/infiniband/core/cm.c  Thu Aug  3 09:18:25 2017        
(r321985)
+++ head/sys/ofed/drivers/infiniband/core/cm.c  Thu Aug  3 09:31:10 2017        
(r321986)
@@ -889,6 +889,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,
@@ -907,7 +908,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);
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to