Merge pull request #1235 from ggouaillardet/topic/ibv_exp_fixes

btl/openib: do not mix exp and non exp verbs

opal/mca/btl/openib/btl_openib_component.c

@@ -834,7 +834,12 @@ static int init_one_port(opal_list_t *btl_list, mca_btl_openib_device_t *device,
             }
 #endif
 
-            switch (openib_btl->device->ib_dev_attr.atomic_cap) {
+#if HAVE_DECL_IBV_EXP_QUERY_DEVICE
+            switch (openib_btl->device->ib_exp_dev_attr.exp_atomic_cap)
+#else
+            switch (openib_btl->device->ib_dev_attr.atomic_cap)
+#endif
+            {
             case IBV_ATOMIC_GLOB:
                 openib_btl->super.btl_flags |= MCA_BTL_ATOMIC_SUPPORTS_GLOB;
                 break;

opal/mca/btl/openib/connect/btl_openib_connect_udcm.c

@@ -1343,7 +1343,7 @@ static int udcm_rc_qp_create_one(udcm_module_t *m, mca_btl_base_endpoint_t* lcl_
 #endif
 
 #if HAVE_DECL_IBV_EXP_ATOMIC_HCA_REPLY_BE
-    if (IBV_EXP_ATOMIC_HCA_REPLY_BE == m->btl->device->ib_dev_attr.atomic_cap) {
+    if (IBV_EXP_ATOMIC_HCA_REPLY_BE == m->btl->device->ib_exp_dev_attr.exp_atomic_cap) {
         init_attr.exp_create_flags = IBV_EXP_QP_CREATE_ATOMIC_BE_REPLY;
         init_attr.comp_mask |= IBV_EXP_QP_INIT_ATTR_CREATE_FLAGS;
     }