* Remove pkey index as an MCA param

* Change name: mca_btl_openib_of_pkey_value -> mca_btl_openib_of_pkey
   (since now there's no index, the "_value" suffix is somewhat
   superfluous)
 * Put in a better help message for the _pkey MCA param (to agree with
   the new help message in v1.2.8)

This commit was SVN r19716.

ompi/mca/btl/openib/btl_openib.h

@@ -180,7 +180,6 @@ struct mca_btl_openib_component_t {
     uint32_t ib_cq_size[2];  /**< Max outstanding CQE on the CQ */
 
     int32_t ib_max_inline_data; /**< Max size of inline data */
-    uint32_t ib_pkey_ix;     /**< InfiniBand pkey index */
     uint32_t ib_pkey_val;
     uint32_t ib_psn;
     uint32_t ib_qp_ous_rd_atom;

ompi/mca/btl/openib/btl_openib_component.c

@@ -1722,8 +1722,7 @@ static int init_one_device(opal_list_t *btl_list, struct ibv_device* ib_dev)
                 break;
             }
             if (0 == mca_btl_openib_component.ib_pkey_val) {
-                ret = init_one_port(btl_list, device, i, mca_btl_openib_component.ib_pkey_ix,
-                                    &ib_port_attr);
+                ret = init_one_port(btl_list, device, i, 0, &ib_port_attr);
             } else {
                 uint16_t pkey,j;
                 for (j = 0; j < device->ib_dev_attr.max_pkeys; j++) {

ompi/mca/btl/openib/btl_openib_mca.c

@@ -276,15 +276,12 @@ int btl_openib_register_mca_params(void)
                   -1, &ival, REGINT_NEG_ONE_OK | REGINT_GE_ZERO));
     mca_btl_openib_component.ib_max_inline_data = (int32_t) ival;
 
-    CHECK(reg_int("of_pkey_ix", "ib_pkey_ix", "OpenFabrics pkey index "
-                  "(must be >= 0)",
-                  0, &ival, REGINT_GE_ZERO));
-    mca_btl_openib_component.ib_pkey_ix = (uint32_t) ival;
-
-    CHECK(reg_string("of_pkey_val", "ib_pkey_val", "OpenFabrics pkey value"
-                "(must be > 0 and < 0xffff)",
-                "0", &pkey, 0));
-    mca_btl_openib_component.ib_pkey_val = ompi_btl_openib_ini_intify(pkey) & MCA_BTL_IB_PKEY_MASK;
+    CHECK(reg_string("of_pkey", "ib_pkey_val", 
+                     "OpenFabrics partition key (pkey) value. "
+                     "Unsigned integer decimal or hex values are allowed (e.g., \"3\" or \"0x3f\") and will be masked against the maximum allowable IB paritition key value (0x7fff)",
+                     "0", &pkey, 0));
+    mca_btl_openib_component.ib_pkey_val = 
+        ompi_btl_openib_ini_intify(pkey) & MCA_BTL_IB_PKEY_MASK;
     if (mca_btl_openib_component.ib_pkey_val > MCA_BTL_IB_PKEY_MASK ||
             mca_btl_openib_component.ib_pkey_val < 0) {
         orte_show_help("help-mpi-btl-openib.txt", "invalid mca param value",