diff --git a/opal/mca/btl/openib/btl_openib.c b/opal/mca/btl/openib/btl_openib.c index 06319699c8..3d2ed4e78d 100644 --- a/opal/mca/btl/openib/btl_openib.c +++ b/opal/mca/btl/openib/btl_openib.c @@ -18,7 +18,7 @@ * Copyright (c) 2008-2012 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2009 IBM Corporation. All rights reserved. * Copyright (c) 2013-2014 Intel, Inc. All rights reserved - * Copyright (c) 2013 NVIDIA Corporation. All rights reserved. + * Copyright (c) 2013-2015 NVIDIA Corporation. All rights reserved. * Copyright (c) 2014-2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2014 Bull SAS. All rights reserved @@ -1716,7 +1716,7 @@ int mca_btl_openib_sendi( struct mca_btl_base_module_t* btl, mca_btl_openib_module_t *obtl = (mca_btl_openib_module_t*)btl; size_t size = payload_size + header_size; int qp = frag_size_to_order(obtl, size), - prio = !(flags & MCA_BTL_DES_FLAGS_PRIORITY), + prio = flags & MCA_BTL_DES_FLAGS_PRIORITY, ib_rc; bool do_rdma = false; ompi_free_list_item_t* item = NULL; diff --git a/opal/mca/btl/openib/btl_openib_endpoint.c b/opal/mca/btl/openib/btl_openib_endpoint.c index 4b22cff9ac..c26aed6395 100644 --- a/opal/mca/btl/openib/btl_openib_endpoint.c +++ b/opal/mca/btl/openib/btl_openib_endpoint.c @@ -18,7 +18,7 @@ * Copyright (c) 2010-2011 IBM Corporation. All rights reserved. * Copyright (c) 2010-2011 Oracle and/or its affiliates. All rights reserved * Copyright (c) 2013-2014 Intel, Inc. All rights reserved - * Copyright (c) 2013 NVIDIA Corporation. All rights reserved. + * Copyright (c) 2013-2015 NVIDIA Corporation. All rights reserved. * Copyright (c) 2014 Bull SAS. All rights reserved. * Copyright (c) 2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. @@ -74,7 +74,7 @@ static inline int acquire_wqe(mca_btl_openib_endpoint_t *ep, int mca_btl_openib_endpoint_post_send(mca_btl_openib_endpoint_t *endpoint, mca_btl_openib_send_frag_t *frag) { - int prio = !(to_base_frag(frag)->base.des_flags & MCA_BTL_DES_FLAGS_PRIORITY); + int prio = to_base_frag(frag)->base.des_flags & MCA_BTL_DES_FLAGS_PRIORITY; mca_btl_openib_header_t *hdr = frag->hdr; mca_btl_base_descriptor_t *des = &to_base_frag(frag)->base; int qp, ib_rc, rc; diff --git a/opal/mca/btl/openib/btl_openib_endpoint.h b/opal/mca/btl/openib/btl_openib_endpoint.h index 6942f27044..ec751c6bec 100644 --- a/opal/mca/btl/openib/btl_openib_endpoint.h +++ b/opal/mca/btl/openib/btl_openib_endpoint.h @@ -18,6 +18,7 @@ * Copyright (c) 2014 Bull SAS. All rights reserved. * Copyright (c) 2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. + * Copyright (c) 2015 NVIDIA Corporation. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -641,6 +642,7 @@ static inline int mca_btl_openib_endpoint_credit_acquire (struct mca_btl_base_en if (!(prio && size < eager_limit && acquire_eager_rdma_send_credit(endpoint) == OPAL_SUCCESS)) { *do_rdma = false; + prio = !prio; if (BTL_OPENIB_QP_TYPE_PP(qp)) { if (OPAL_THREAD_ADD32(&endpoint->qps[qp].u.pp_qp.sd_credits, -1) < 0) {