[OPENSM] Identify which OSM vendor used in building OSM.

git-svn-id: svn://openib.tc.cornell.edu/gen1@2767 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/trunk/ulp/opensm/user/include/opensm/osm_config.h b/trunk/ulp/opensm/user/include/opensm/osm_config.h
index 5ae97a1450eba38f9dfb7072bb37557a412a02d1..9d9a023859c22870b0ada8dc3743006840764819 100644 (file)
--- a/trunk/ulp/opensm/user/include/opensm/osm_config.h
+++ b/trunk/ulp/opensm/user/include/opensm/osm_config.h
@@ -30,7 +30,7 @@
 /* #undef ENABLE_OSM_PERF_MGR_PROFILE */\r
 \r
 /* Define a default node name map file */\r
-#define HAVE_DEFAULT_NODENAME_MAP "%ProgramFiles%\\OFED\\OpenSM\\ib-node-name.map"\r
+#define HAVE_DEFAULT_NODENAME_MAP "%ProgramFiles%\\OFED\\OpenSM\\ib-node-name-map.conf"\r
 \r
 /* Define a default OpenSM config file */\r
 #undef HAVE_DEFAULT_OPENSM_CONFIG_FILE\r

diff --git a/trunk/ulp/opensm/user/include/opensm/osm_version.h b/trunk/ulp/opensm/user/include/opensm/osm_version.h
index 8f614085be4cbc60371e29f07122a6d1693370b1..5e7f64773257a9d1d66f85249975ba50e1390919 100644 (file)
--- a/trunk/ulp/opensm/user/include/opensm/osm_version.h
+++ b/trunk/ulp/opensm/user/include/opensm/osm_version.h
@@ -45,7 +45,11 @@
 *\r
 * SYNOPSIS\r
 */\r
-#define OSM_VERSION "OpenSM 3.3.3"\r
+#ifdef OSM_VENDOR_INTF_AL\r
+#define OSM_VERSION "OpenSM 3.3.3" " IBAL"\r
+#else\r
+#define OSM_VERSION "OpenSM 3.3.3" " UMAD"\r
+#endif\r
 /********/\r
 \r
 #endif                         /* _OSM_VERSION_H_ */\r