Merge pull request open-mpi#1036 from jsquyres/pr/v1.10/usnic-extension-fix

rhc54 · rhc54 · commit 809fcff4f6c5 · 2016-03-22T05:20:18.000-07:00
usnic: use version 1 of the API, not the current version
diff --git a/ompi/mca/btl/usnic/btl_usnic_component.c b/ompi/mca/btl/usnic/btl_usnic_component.c
@@ -845,7 +845,7 @@ static mca_btl_base_module_t** usnic_component_init(int* num_btl_modules,
         }
 
         ret =
-            module->usnic_fabric_ops->getinfo(FI_EXT_USNIC_INFO_VERSION,
+            module->usnic_fabric_ops->getinfo(1,
                                             fabric,
                                             &module->usnic_info);
         if (ret != 0) {

Original file line number	Diff line number	Diff line change
`@@ -845,7 +845,7 @@ static mca_btl_base_module_t** usnic_component_init(int* num_btl_modules,`
`845`	`845`	`}`
`846`	`846`
`847`	`847`	`ret =`
`848`		`- module->usnic_fabric_ops->getinfo(FI_EXT_USNIC_INFO_VERSION,`
	`848`	`+ module->usnic_fabric_ops->getinfo(1,`
`849`	`849`	`fabric,`
`850`	`850`	`&module->usnic_info);`
`851`	`851`	`if (ret != 0) {`