rdma-core/ibacm-Incorrect-usage-of-BE-byte-order-of-MLID-attach-detach_mcast.patch
Nicolas Morey-Chaisemartin d3320b52d7 Accepting request 534947 from home:NMoreyChaisemartin:branches:science:HPC
- Backport patches from upstream:
  * ibacm-Incorrect-usage-of-BE-byte-order-of-MLID-attach-detach_mcast.patc
    Fixes a byte order issue which causes ibacm to fail to join a multicast
    group on recent on recent kernels. (bsc#1063639, bsc#1063697)
  * ibacm-Incorrect-list-used-for-subnet-list-causes-a-segfault.patch
    Fixes a sefgault of ibacm when a provider other than default
    is set (bsc#1063642, bsc#1063698)

OBS-URL: https://build.opensuse.org/request/show/534947
OBS-URL: https://build.opensuse.org/package/show/science:HPC/rdma-core?expand=0&rev=53
2017-10-18 15:38:45 +00:00

23 lines
874 B
Diff

diff --git ibacm/prov/acmp/src/acmp.c ibacm/prov/acmp/src/acmp.c
index aa784166..78d9a295 100644
--- ibacm/prov/acmp/src/acmp.c
+++ ibacm/prov/acmp/src/acmp.c
@@ -732,7 +732,7 @@ static void acmp_process_join_resp(struct acm_sa_mad *sa_mad)
acm_log(0, "ERROR - unable to create ah\n");
goto out;
}
- ret = ibv_attach_mcast(ep->qp, &mc_rec->mgid, mc_rec->mlid);
+ ret = ibv_attach_mcast(ep->qp, &dest->mgid, dest->av.dlid);
if (ret) {
acm_log(0, "ERROR - unable to attach QP to multicast group\n");
ibv_destroy_ah(dest->ah);
@@ -1429,7 +1429,7 @@ static void acmp_ep_join(struct acmp_ep *ep)
if (ep->mc_dest[0].state == ACMP_READY && ep->mc_dest[0].ah) {
ibv_detach_mcast(ep->qp, &ep->mc_dest[0].mgid,
- be16toh(ep->mc_dest[0].av.dlid));
+ ep->mc_dest[0].av.dlid);
ibv_destroy_ah(ep->mc_dest[0].ah);
ep->mc_dest[0].ah = NULL;
}