From 370b1c75c4135d622e6e10a99f322cba31adbaf4 Mon Sep 17 00:00:00 2001 From: Vasily Filipov Date: Thu, 14 Jan 2010 16:09:10 +0000 Subject: [PATCH] Added addition condition for create_srq This commit was SVN r22403. --- ompi/mca/btl/openib/btl_openib.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ompi/mca/btl/openib/btl_openib.c b/ompi/mca/btl/openib/btl_openib.c index 92a280ec72..dc40a87a99 100644 --- a/ompi/mca/btl/openib/btl_openib.c +++ b/ompi/mca/btl/openib/btl_openib.c @@ -292,11 +292,11 @@ static int create_srq(mca_btl_openib_module_t *openib_btl) rc = check_if_device_support_modify_srq(openib_btl); if(OMPI_ERR_NOT_SUPPORTED == rc) { device_support_modify_srq = false; - } else if(OMPI_ERROR == rc) { + } else if(OMPI_SUCCESS != rc) { mca_btl_openib_show_init_error(__FILE__, __LINE__, "ibv_create_srq", ibv_get_device_name(openib_btl->device->ib_dev)); - return OMPI_ERROR; + return rc; } /* create the SRQ's */ @@ -382,8 +382,10 @@ static int mca_btl_openib_size_queues(struct mca_btl_openib_module_t* openib_btl goto out; } - if (0 == openib_btl->num_peers) { - rc = create_srq(openib_btl); + if (0 == openib_btl->num_peers && + (mca_btl_openib_component.num_srq_qps > 0 || + mca_btl_openib_component.num_xrc_qps > 0)) { + rc = create_srq(openib_btl); } openib_btl->num_peers += nprocs;