Date: Fri, 13 Aug 2010 05:45:36 +0000 (UTC) From: Jeff Roberson <jeff@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r211273 - in projects/ofed/head/contrib/ofed/management: infiniband-diags/src opensm/include/opensm Message-ID: <201008130545.o7D5jaiN010646@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <infiniband/complib/cl_debug.h> #include <infiniband/complib/cl_nodenamemap.h> +#include <netinet/in.h> + #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_ */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008130545.o7D5jaiN010646>