From owner-svn-src-projects@FreeBSD.ORG Fri Aug 13 05:45:36 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8875F1065696; Fri, 13 Aug 2010 05:45:36 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 752978FC15; Fri, 13 Aug 2010 05:45:36 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7D5jajL010649; Fri, 13 Aug 2010 05:45:36 GMT (envelope-from jeff@svn.freebsd.org) Received: (from jeff@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7D5jaiN010646; Fri, 13 Aug 2010 05:45:36 GMT (envelope-from jeff@svn.freebsd.org) Message-Id: <201008130545.o7D5jaiN010646@svn.freebsd.org> From: Jeff Roberson Date: Fri, 13 Aug 2010 05:45:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r211273 - in projects/ofed/head/contrib/ofed/management: infiniband-diags/src opensm/include/opensm X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Aug 2010 05:45:36 -0000 Author: jeff Date: Fri Aug 13 05:45:36 2010 New Revision: 211273 URL: http://svn.freebsd.org/changeset/base/211273 Log: - Update the osm_config.h to match the one generated by configure. - Add a missing include to saquery. Sponsored by: Isilon Systems, iX Systems, and Panasas. Modified: projects/ofed/head/contrib/ofed/management/infiniband-diags/src/saquery.c projects/ofed/head/contrib/ofed/management/opensm/include/opensm/osm_config.h Modified: projects/ofed/head/contrib/ofed/management/infiniband-diags/src/saquery.c ============================================================================== --- projects/ofed/head/contrib/ofed/management/infiniband-diags/src/saquery.c Fri Aug 13 05:43:09 2010 (r211272) +++ projects/ofed/head/contrib/ofed/management/infiniband-diags/src/saquery.c Fri Aug 13 05:45:36 2010 (r211273) @@ -56,6 +56,8 @@ #include #include +#include + #include "ibdiag_common.h" struct query_cmd { Modified: projects/ofed/head/contrib/ofed/management/opensm/include/opensm/osm_config.h ============================================================================== --- projects/ofed/head/contrib/ofed/management/opensm/include/opensm/osm_config.h Fri Aug 13 05:43:09 2010 (r211272) +++ projects/ofed/head/contrib/ofed/management/opensm/include/opensm/osm_config.h Fri Aug 13 05:45:36 2010 (r211273) @@ -1,3 +1,4 @@ +/* include/opensm/osm_config.h. Generated from osm_config.h.in by configure. */ /* include/osm_config.h.in * * Defines various OpenSM configuration parameters to be used by various @@ -8,57 +9,57 @@ */ #ifndef _OSM_CONFIG_H_ -#define _OSM_CONFIG_H_ +#define _OSM_CONFIG_H_ 1 /* define 1 if OpenSM build is in a debug mode */ -#undef OSM_DEBUG +/* #undef OSM_DEBUG */ /* Define as 1 if you want Dual Sided RMPP Support */ -#undef DUAL_SIDED_RMPP +#define DUAL_SIDED_RMPP 1 /* Define as 1 if you want to enable a console on a socket connection */ -#undef ENABLE_OSM_CONSOLE_SOCKET +/* #undef ENABLE_OSM_CONSOLE_SOCKET */ /* Define as 1 if you want to enable the event plugin */ -#undef ENABLE_OSM_DEFAULT_EVENT_PLUGIN +/* #undef ENABLE_OSM_DEFAULT_EVENT_PLUGIN */ /* Define as 1 if you want to enable the performance manager */ -#undef ENABLE_OSM_PERF_MGR +/* #undef ENABLE_OSM_PERF_MGR */ /* Define as 1 if you want to enable the performance manager profiling code */ -#undef ENABLE_OSM_PERF_MGR_PROFILE +/* #undef ENABLE_OSM_PERF_MGR_PROFILE */ /* Define a default node name map file */ -#undef HAVE_DEFAULT_NODENAME_MAP +#define HAVE_DEFAULT_NODENAME_MAP "/usr/local/etc/opensm/ib-node-name-map" /* Define a default OpenSM config file */ -#undef HAVE_DEFAULT_OPENSM_CONFIG_FILE +#define HAVE_DEFAULT_OPENSM_CONFIG_FILE "/usr/local/etc/opensm/opensm.conf" /* Define a Partition config file */ -#undef HAVE_DEFAULT_PARTITION_CONFIG_FILE +#define HAVE_DEFAULT_PARTITION_CONFIG_FILE "/usr/local/etc/opensm/partitions.conf" /* Define a Prefix Routes config file */ -#undef HAVE_DEFAULT_PREFIX_ROUTES_FILE +#define HAVE_DEFAULT_PREFIX_ROUTES_FILE "/usr/local/etc/opensm/prefix-routes.conf" /* Define a QOS policy config file */ -#undef HAVE_DEFAULT_QOS_POLICY_FILE +#define HAVE_DEFAULT_QOS_POLICY_FILE "/usr/local/etc/opensm/qos-policy.conf" /* Define OpenSM config directory */ -#define OPENSM_CONFIG_DIR "/etc/opensm" +#define OPENSM_CONFIG_DIR "/usr/local/etc/opensm" /* Define as 1 for vapi vendor */ -#undef OSM_VENDOR_INTF_MTL +/* #undef OSM_VENDOR_INTF_MTL */ /* Define as 1 for OpenIB vendor */ -#define OSM_VENDOR_INTF_OPENIB 1 +#define OSM_VENDOR_INTF_OPENIB 1 /* Define as 1 for sim vendor */ -#undef OSM_VENDOR_INTF_SIM +/* #undef OSM_VENDOR_INTF_SIM */ /* Define as 1 for ts vendor */ -#undef OSM_VENDOR_INTF_TS +/* #undef OSM_VENDOR_INTF_TS */ /* Define as 1 if you want Vendor RMPP Support */ -#undef VENDOR_RMPP_SUPPORT +#define VENDOR_RMPP_SUPPORT 1 #endif /* _OSM_CONFIG_H_ */