btl/openib: fix recieve queue source detection

opal/mca/btl/openib/btl_openib.c

@@ -522,7 +522,9 @@ static int mca_btl_openib_tune_endpoint(mca_btl_openib_module_t* openib_btl,
     switch(mca_btl_openib_component.receive_queues_source) {
     case MCA_BASE_VAR_SOURCE_COMMAND_LINE:
     case MCA_BASE_VAR_SOURCE_ENV:
-        case MCA_BASE_VAR_SOURCE_MAX:
+    case MCA_BASE_VAR_SOURCE_FILE:
+    case MCA_BASE_VAR_SOURCE_SET:
+    case MCA_BASE_VAR_SOURCE_OVERRIDE:
         break;
 
         /* If the queues configuration was set from command line
@@ -532,9 +534,7 @@ static int mca_btl_openib_tune_endpoint(mca_btl_openib_module_t* openib_btl,
            not possible that remote side got its queues configuration from command line =>
            (by prio) the configuration was set from INI file or (if not configure)
            by default queues configuration */
-        case MCA_BASE_VAR_SOURCE_FILE:
-        case MCA_BASE_VAR_SOURCE_SET:
-        case MCA_BASE_VAR_SOURCE_OVERRIDE:
+    case BTL_OPENIB_RQ_SOURCE_DEVICE_INI:
         if(NULL != values.receive_queues) {
             recv_qps = values.receive_queues;
         } else {

opal/mca/btl/openib/btl_openib.h

@@ -126,10 +126,7 @@ struct mca_btl_openib_qp_info_t {
     (BTL_OPENIB_QP_TYPE(Q) == MCA_BTL_OPENIB_XRC_QP)
 
 typedef enum {
-    BTL_OPENIB_RQ_SOURCE_DEFAULT,
-    BTL_OPENIB_RQ_SOURCE_MCA,
-    BTL_OPENIB_RQ_SOURCE_DEVICE_INI,
-    BTL_OPENIB_RQ_SOURCE_MAX
+    BTL_OPENIB_RQ_SOURCE_DEVICE_INI = MCA_BASE_VAR_SOURCE_MAX,
 } btl_openib_receive_queues_source_t;
 
 typedef enum {

opal/mca/btl/openib/btl_openib_component.c

@@ -1975,9 +1975,7 @@ static int init_one_device(opal_list_t *btl_list, struct ibv_device* ib_dev)
         }
 
         /* If the MCA param was specified, skip all the checks */
-        if ( MCA_BASE_VAR_SOURCE_COMMAND_LINE ||
-                MCA_BASE_VAR_SOURCE_ENV ==
-            mca_btl_openib_component.receive_queues_source) {
+        if (MCA_BASE_VAR_SOURCE_DEFAULT != mca_btl_openib_component.receive_queues_source) {
             goto good;
         }
 
@@ -1995,7 +1993,7 @@ static int init_one_device(opal_list_t *btl_list, struct ibv_device* ib_dev)
                 mca_btl_openib_component.receive_queues =
                     strdup(values.receive_queues);
                 mca_btl_openib_component.receive_queues_source =
-                    MCA_BASE_VAR_SOURCE_FILE;
+                    BTL_OPENIB_RQ_SOURCE_DEVICE_INI;
             }
         }