From 4643110c5ed85234ac987522a494561b526c4392 Mon Sep 17 00:00:00 2001 From: Howard Pritchard Date: Tue, 27 Jan 2015 20:02:05 -0700 Subject: [PATCH] mtl/psm: fix problem with cancel sends incorporate patch from @afriedle-intel to fix problem with psm mtl cancel of sends. Sorry for the delay in getting to this. Fixes 347 --- ompi/mca/mtl/psm/mtl_psm_cancel.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ompi/mca/mtl/psm/mtl_psm_cancel.c b/ompi/mca/mtl/psm/mtl_psm_cancel.c index 6da3386a6d..8c22673d6c 100644 --- a/ompi/mca/mtl/psm/mtl_psm_cancel.c +++ b/ompi/mca/mtl/psm/mtl_psm_cancel.c @@ -31,6 +31,11 @@ int ompi_mtl_psm_cancel(struct mca_mtl_base_module_t* mtl, mca_mtl_psm_request_t *mtl_psm_request = (mca_mtl_psm_request_t*) mtl_request; + /* PSM does not support canceling sends */ + if(OMPI_MTL_PSM_ISEND == mtl_psm_request->type) { + return OMPI_SUCCESS; + } + err = psm_mq_cancel(&mtl_psm_request->psm_request); if(PSM_OK == err) { err = psm_mq_test(&mtl_psm_request->psm_request, &status);