cm: fix selection priority

This patch removes a priority check that disables cm if the previous
pml had higher priority. The check was incorrect as coded and is
unnecessary as we finalize all but one pml anyway.

Fixes open-mpi#1035

Signed-off-by: Nathan Hjelm <[email protected]>

(cherry picked from open-mpi/ompi@2fd176a)

Author: hjelmn

ompi/mca/pml/cm/pml_cm_component.c

@@ -143,11 +143,6 @@ mca_pml_cm_component_init(int* priority,
 {
     int ret;
 
-    if((*priority) > ompi_pml_cm.default_priority) {
-        *priority = ompi_pml_cm.default_priority;
-        return NULL;
-    }
-    *priority = ompi_pml_cm.default_priority;
     opal_output_verbose( 10, 0,
                          "in cm pml priority is %d\n", *priority);
     /* find a useable MTL */
@@ -166,9 +161,10 @@ mca_pml_cm_component_init(int* priority,
          * may still select PML/ob1 (BTLs) or PML/cm (MTLs) if preferable for the app/site.
          */
         *priority = 30;
+    } else {
+        *priority = ompi_pml_cm.default_priority;
     }
 
-
     if (ompi_mtl->mtl_flags & MCA_MTL_BASE_FLAG_REQUIRE_WORLD) {
         ompi_pml_cm.super.pml_flags |= MCA_PML_BASE_FLAG_REQUIRE_WORLD;
     }