From 1f9218a0bca7f1cef1da74b67ad3e79f5d144d91 Mon Sep 17 00:00:00 2001
From: matcabral <matias.a.cabral@intel.com>
Date: Wed, 2 Sep 2015 02:22:30 -0700
Subject: [PATCH] Fix for openib btl mca command line parameter btl_openib_mtu
 being ignored.

---
 opal/mca/btl/openib/btl_openib_component.c | 10 +++++++---
 opal/mca/btl/openib/btl_openib_mca.c       |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/opal/mca/btl/openib/btl_openib_component.c b/opal/mca/btl/openib/btl_openib_component.c
index 5150f7b4b8..452774a928 100644
--- a/opal/mca/btl/openib/btl_openib_component.c
+++ b/opal/mca/btl/openib/btl_openib_component.c
@@ -1720,7 +1720,11 @@ static int init_one_device(opal_list_t *btl_list, struct ibv_device* ib_dev)
     /* If we did find values for this device (or in the defaults
        section), handle them */
     merge_values(&values, &default_values);
-    if (values.mtu_set) {
+    /*  If MCA param was set, use it. If not, check the INI file
+        or default to IBV_MTU_1024 */
+    if (0 < mca_btl_openib_component.ib_mtu) {
+        device->mtu = mca_btl_openib_component.ib_mtu;
+    } else if (values.mtu_set) {
         switch (values.mtu) {
         case 256:
             device->mtu = IBV_MTU_256;
@@ -1739,11 +1743,11 @@ static int init_one_device(opal_list_t *btl_list, struct ibv_device* ib_dev)
             break;
         default:
             BTL_ERROR(("invalid MTU value specified in INI file (%d); ignored", values.mtu));
-            device->mtu = mca_btl_openib_component.ib_mtu;
+            device->mtu = IBV_MTU_1024 ;
             break;
         }
     } else {
-        device->mtu = mca_btl_openib_component.ib_mtu;
+        device->mtu = IBV_MTU_1024 ;
     }
 
     /* Allocate the protection domain for the device */
diff --git a/opal/mca/btl/openib/btl_openib_mca.c b/opal/mca/btl/openib/btl_openib_mca.c
index 1c3edc5a7e..8cc9384417 100644
--- a/opal/mca/btl/openib/btl_openib_mca.c
+++ b/opal/mca/btl/openib/btl_openib_mca.c
@@ -368,7 +368,7 @@ int btl_openib_register_mca_params(void)
         /* Don't try to recover from this */
         return OPAL_ERR_OUT_OF_RESOURCE;
     }
-    mca_btl_openib_component.ib_mtu = IBV_MTU_1024;
+    mca_btl_openib_component.ib_mtu = 0;
     (void) mca_base_var_enum_create("btl_openib_mtus", ib_mtu_values, &new_enum);
     tmp = mca_base_component_var_register(&mca_btl_openib_component.super.btl_version,
                                           "mtu", msg, MCA_BASE_VAR_TYPE_INT, new_enum,