svn commit: r337092 - stable/11/sys/ofed/drivers/infiniband/core

[Hans Petter Selasky]

Author: hselasky
Date: Thu Aug  2 08:29:40 2018
New Revision: 337092
URL: https://svnweb.freebsd.org/changeset/base/337092

Log:
  MFC r336387:
  Honor return status of ib_init_ah_from_mcmember() in ibcore.
  
  The return status of ib_init_ah_from_mcmember() is ignored by
  cma_ib_mc_handler().  Honor it and return error event if ah attribute
  initialization failed.
  
  Linux commit:
  6d337179f28cc50ddd7e224f677b4cda70b275fc
  
  Sponsored by:		Mellanox Technologies

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

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_cma.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_cma.c	Thu Aug  2 08:28:49 2018	(r337091)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_cma.c	Thu Aug  2 08:29:40 2018	(r337092)
@@ -3764,10 +3764,14 @@ static int cma_ib_mc_handler(int status, struct ib_sa_
 			rdma_start_port(id_priv->cma_dev->device)];
 
 		event.event = RDMA_CM_EVENT_MULTICAST_JOIN;
-		ib_init_ah_from_mcmember(id_priv->id.device,
-					 id_priv->id.port_num, &multicast->rec,
-					 ndev, gid_type,
-					 &event.param.ud.ah_attr);
+		ret = ib_init_ah_from_mcmember(id_priv->id.device,
+					       id_priv->id.port_num,
+					       &multicast->rec,
+					       ndev, gid_type,
+					       &event.param.ud.ah_attr);
+		if (ret)
+			event.event = RDMA_CM_EVENT_MULTICAST_ERROR;
+
 		event.param.ud.qp_num = 0xFFFFFF;
 		event.param.ud.qkey = be32_to_cpu(multicast->rec.qkey);
 		if (ndev)