[ofa-general] [PATCH 4/4] opensm: remove not used osm_sa_*.h header files

Sasha Khapyorsky sashak at voltaire.com
Thu Jan 3 02:01:15 PST 2008


Remove not used anymore osm_sa_*.h header files.

Signed-off-by: Sasha Khapyorsky <sashak at voltaire.com>
---
 opensm/include/Makefile.am                      |   18 --
 opensm/include/opensm/osm_sa_class_port_info.h  |  252 -------------------
 opensm/include/opensm/osm_sa_guidinfo_record.h  |  259 -------------------
 opensm/include/opensm/osm_sa_informinfo.h       |  275 --------------------
 opensm/include/opensm/osm_sa_lft_record.h       |  266 --------------------
 opensm/include/opensm/osm_sa_link_record.h      |  258 -------------------
 opensm/include/opensm/osm_sa_mcmember_record.h  |  305 -----------------------
 opensm/include/opensm/osm_sa_mft_record.h       |  265 --------------------
 opensm/include/opensm/osm_sa_multipath_record.h |  254 -------------------
 opensm/include/opensm/osm_sa_node_record.h      |  258 -------------------
 opensm/include/opensm/osm_sa_path_record.h      |  255 -------------------
 opensm/include/opensm/osm_sa_pkey_record.h      |  248 ------------------
 opensm/include/opensm/osm_sa_portinfo_record.h  |  261 -------------------
 opensm/include/opensm/osm_sa_response.h         |  212 ----------------
 opensm/include/opensm/osm_sa_service_record.h   |  274 --------------------
 opensm/include/opensm/osm_sa_slvl_record.h      |  261 -------------------
 opensm/include/opensm/osm_sa_sminfo_record.h    |  252 -------------------
 opensm/include/opensm/osm_sa_sw_info_record.h   |  265 --------------------
 opensm/include/opensm/osm_sa_vlarb_record.h     |  262 -------------------
 19 files changed, 0 insertions(+), 4700 deletions(-)
 delete mode 100644 opensm/include/opensm/osm_sa_class_port_info.h
 delete mode 100644 opensm/include/opensm/osm_sa_guidinfo_record.h
 delete mode 100644 opensm/include/opensm/osm_sa_informinfo.h
 delete mode 100644 opensm/include/opensm/osm_sa_lft_record.h
 delete mode 100644 opensm/include/opensm/osm_sa_link_record.h
 delete mode 100644 opensm/include/opensm/osm_sa_mcmember_record.h
 delete mode 100644 opensm/include/opensm/osm_sa_mft_record.h
 delete mode 100644 opensm/include/opensm/osm_sa_multipath_record.h
 delete mode 100644 opensm/include/opensm/osm_sa_node_record.h
 delete mode 100644 opensm/include/opensm/osm_sa_path_record.h
 delete mode 100644 opensm/include/opensm/osm_sa_pkey_record.h
 delete mode 100644 opensm/include/opensm/osm_sa_portinfo_record.h
 delete mode 100644 opensm/include/opensm/osm_sa_response.h
 delete mode 100644 opensm/include/opensm/osm_sa_service_record.h
 delete mode 100644 opensm/include/opensm/osm_sa_slvl_record.h
 delete mode 100644 opensm/include/opensm/osm_sa_sminfo_record.h
 delete mode 100644 opensm/include/opensm/osm_sa_sw_info_record.h
 delete mode 100644 opensm/include/opensm/osm_sa_vlarb_record.h

diff --git a/opensm/include/Makefile.am b/opensm/include/Makefile.am
index cdb83c9..117087f 100644
--- a/opensm/include/Makefile.am
+++ b/opensm/include/Makefile.am
@@ -4,45 +4,32 @@ SUBDIRS = .
 nobase_pkginclude_HEADERS = iba/ib_types.h iba/ib_cm_types.h
 
 EXTRA_DIST = \
-	$(srcdir)/opensm/osm_sa_path_record.h \
 	$(srcdir)/opensm/osm_lid_mgr.h \
 	$(srcdir)/opensm/osm_port.h \
 	$(srcdir)/opensm/osm_sm_state_mgr.h \
 	$(srcdir)/opensm/osm_state_mgr.h \
 	$(srcdir)/opensm/osm_rand_fwd_tbl.h \
-	$(srcdir)/opensm/osm_sa_vlarb_record.h \
 	$(srcdir)/opensm/osm_madw.h \
 	$(srcdir)/opensm/osm_subnet.h \
 	$(srcdir)/opensm/osm_sweep_fail_ctrl.h \
-	$(srcdir)/opensm/osm_sa_lft_record.h \
-	$(srcdir)/opensm/osm_sa_mft_record.h \
 	$(srcdir)/opensm/osm_resp.h \
 	$(srcdir)/opensm/osm_partition.h \
 	$(srcdir)/opensm/osm_helper.h \
-	$(srcdir)/opensm/osm_sa_portinfo_record.h \
-	$(srcdir)/opensm/osm_sa_guidinfo_record.h \
-	$(srcdir)/opensm/osm_sa_multipath_record.h \
-	$(srcdir)/opensm/osm_sa_service_record.h \
-	$(srcdir)/opensm/osm_sa_response.h \
 	$(srcdir)/opensm/osm_node.h \
 	$(srcdir)/opensm/osm_console.h \
 	$(srcdir)/opensm/osm_req.h \
 	$(srcdir)/opensm/osm_mcm_info.h \
-	$(srcdir)/opensm/osm_sa_pkey_record.h \
 	$(srcdir)/opensm/osm_inform.h \
 	$(srcdir)/opensm/osm_path.h \
 	$(srcdir)/opensm/osm_service.h \
 	$(srcdir)/opensm/osm_switch.h \
 	$(srcdir)/opensm/osm_router.h \
 	$(srcdir)/opensm/osm_prefix_route.h \
-	$(srcdir)/opensm/osm_sa_slvl_record.h \
 	$(srcdir)/opensm/osm_opensm.h \
 	$(srcdir)/opensm/osm_sa.h \
 	$(srcdir)/opensm/osm_port_profile.h \
 	$(srcdir)/opensm/osm_multicast.h \
-	$(srcdir)/opensm/osm_sa_class_port_info.h \
 	$(srcdir)/opensm/osm_base.h \
-	$(srcdir)/opensm/osm_sa_sminfo_record.h \
 	$(srcdir)/opensm/osm_mcast_mgr.h \
 	$(srcdir)/opensm/osm_errors.h \
 	$(srcdir)/opensm/osm_event_plugin.h \
@@ -51,18 +38,15 @@ EXTRA_DIST = \
 	$(srcdir)/opensm/osm_lin_fwd_tbl.h \
 	$(srcdir)/opensm/osm_ucast_mgr.h \
 	$(srcdir)/opensm/osm_db.h \
-	$(srcdir)/opensm/osm_sa_informinfo.h \
 	$(srcdir)/opensm/osm_mad_pool.h \
 	$(srcdir)/opensm/osm_remote_sm.h \
 	$(srcdir)/opensm/osm_link_mgr.h \
 	$(srcdir)/opensm/osm_msgdef.h \
-	$(srcdir)/opensm/osm_sa_node_record.h \
 	$(srcdir)/opensm/st.h \
 	$(srcdir)/opensm/osm_mcast_tbl.h \
 	$(srcdir)/opensm/osm_pkey.h \
 	$(srcdir)/opensm/osm_pkey_mgr.h \
 	$(srcdir)/opensm/osm_sa_mad_ctrl.h \
-	$(srcdir)/opensm/osm_sa_link_record.h \
 	$(srcdir)/opensm/osm_mcm_port.h \
 	$(srcdir)/opensm/osm_log.h \
 	$(srcdir)/opensm/osm_fwd_tbl.h \
@@ -70,8 +54,6 @@ EXTRA_DIST = \
 	$(srcdir)/opensm/osm_sm_mad_ctrl.h \
 	$(srcdir)/opensm/osm_attrib_req.h \
 	$(srcdir)/opensm/osm_stats.h \
-	$(srcdir)/opensm/osm_sa_mcmember_record.h \
-	$(srcdir)/opensm/osm_sa_sw_info_record.h \
 	$(srcdir)/opensm/osm_vl15intf.h \
 	$(srcdir)/opensm/osm_drop_mgr.h \
 	$(srcdir)/opensm/osm_perfmgr.h \
diff --git a/opensm/include/opensm/osm_sa_class_port_info.h b/opensm/include/opensm/osm_sa_class_port_info.h
deleted file mode 100644
index 52b3c9e..0000000
--- a/opensm/include/opensm/osm_sa_class_port_info.h
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * Copyright (c) 2004-2007 Voltaire, Inc. All rights reserved.
- * Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
- * Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
- *
- * This software is available to you under a choice of one of two
- * licenses.  You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
- *
- *     Redistribution and use in source and binary forms, with or
- *     without modification, are permitted provided that the following
- *     conditions are met:
- *
- *      - Redistributions of source code must retain the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-/*
- * Abstract:
- * 	Declaration of osm_cpi_rcv_t.
- *	This object represents the ClassPortInfo Receiver object.
- *	This object is part of the OpenSM family of objects.
- *
- * Environment:
- * 	Linux User Mode
- *
- * $Revision: 1.2 $
- */
-
-#ifndef _OSM_CPI_H_
-#define _OSM_CPI_H_
-
-#include <complib/cl_passivelock.h>
-#include <opensm/osm_base.h>
-#include <opensm/osm_madw.h>
-#include <opensm/osm_subnet.h>
-#include <opensm/osm_port.h>
-#include <opensm/osm_log.h>
-
-#ifdef __cplusplus
-#  define BEGIN_C_DECLS extern "C" {
-#  define END_C_DECLS   }
-#else				/* !__cplusplus */
-#  define BEGIN_C_DECLS
-#  define END_C_DECLS
-#endif				/* __cplusplus */
-
-BEGIN_C_DECLS
-/****h* OpenSM/ClassPort Info Receiver
-* NAME
-*	ClassPort Info Receiver
-*
-* DESCRIPTION
-*	The ClassPort Info Receiver object encapsulates the information
-*	needed to receive the ClassPortInfo request from a node.
-*
-*	The ClassPort Info Receiver object is thread safe.
-*
-*	This object should be treated as opaque and should be
-*	manipulated only through the provided functions.
-*
-* AUTHOR
-*	Eitan Zahavi, Mellanox
-*
-*********/
-/****s* OpenSM: ClassPort Info Receiver/osm_cpi_rcv_t
-* NAME
-*	osm_cpi_rcv_t
-*
-* DESCRIPTION
-*	ClassPort Info Receiver structure.
-*
-*	This object should be treated as opaque and should
-*	be manipulated only through the provided functions.
-*
-* SYNOPSIS
-*/
-typedef struct _osm_cpi_rcv {
-	osm_subn_t *p_subn;
-	osm_sa_resp_t *p_resp;
-	osm_mad_pool_t *p_mad_pool;
-	osm_log_t *p_log;
-	cl_plock_t *p_lock;
-} osm_cpi_rcv_t;
-/*
-* FIELDS
-*	p_subn
-*		Pointer to the Subnet object for this subnet.
-*
-*	p_gen_req_ctrl
-*		Pointer to the generic request controller.
-*
-*	p_log
-*		Pointer to the log object.
-*
-*	p_lock
-*		Pointer to the serializing lock.
-*
-* SEE ALSO
-*	ClassPort Info Receiver object
-*********/
-
-/****f* OpenSM: ClassPort Info Receiver/osm_cpi_rcv_construct
-* NAME
-*	osm_cpi_rcv_construct
-*
-* DESCRIPTION
-*	This function constructs a ClassPort Info Receiver object.
-*
-* SYNOPSIS
-*/
-void osm_cpi_rcv_construct(IN osm_cpi_rcv_t * const p_rcv);
-/*
-* PARAMETERS
-*	p_rcv
-*		[in] Pointer to a ClassPort Info Receiver object to construct.
-*
-* RETURN VALUE
-*	This function does not return a value.
-*
-* NOTES
-*	Allows calling osm_cpi_rcv_init, osm_cpi_rcv_destroy
-*
-*	Calling osm_cpi_rcv_construct is a prerequisite to calling any other
-*	method except osm_cpi_rcv_init.
-*
-* SEE ALSO
-*	ClassPort Info Receiver object, osm_cpi_rcv_init, osm_cpi_rcv_destroy
-*********/
-
-/****f* OpenSM: ClassPort Info Receiver/osm_cpi_rcv_destroy
-* NAME
-*	osm_cpi_rcv_destroy
-*
-* DESCRIPTION
-*	The osm_cpi_rcv_destroy function destroys the object, releasing
-*	all resources.
-*
-* SYNOPSIS
-*/
-void osm_cpi_rcv_destroy(IN osm_cpi_rcv_t * const p_rcv);
-/*
-* PARAMETERS
-*	p_rcv
-*		[in] Pointer to the object to destroy.
-*
-* RETURN VALUE
-*	This function does not return a value.
-*
-* NOTES
-*	Performs any necessary cleanup of the specified
-*	ClassPort Info Receiver object.
-*	Further operations should not be attempted on the destroyed object.
-*	This function should only be called after a call to
-*	osm_cpi_rcv_construct or osm_cpi_rcv_init.
-*
-* SEE ALSO
-*	ClassPort Info Receiver object, osm_cpi_rcv_construct,
-*	osm_cpi_rcv_init
-*********/
-
-/****f* OpenSM: ClassPort Info Receiver/osm_cpi_rcv_init
-* NAME
-*	osm_cpi_rcv_init
-*
-* DESCRIPTION
-*	The osm_cpi_rcv_init function initializes a
-*	ClassPort Info Receiver object for use.
-*
-* SYNOPSIS
-*/
-ib_api_status_t
-osm_cpi_rcv_init(IN osm_cpi_rcv_t * const p_rcv,
-		 IN osm_sa_resp_t * const p_resp,
-		 IN osm_mad_pool_t * const p_mad_pool,
-		 IN osm_subn_t * const p_subn,
-		 IN osm_log_t * const p_log, IN cl_plock_t * const p_lock);
-/*
-* PARAMETERS
-*	p_rcv
-*		[in] Pointer to an osm_cpi_rcv_t object to initialize.
-*
-*	p_subn
-*		[in] Pointer to the Subnet object for this subnet.
-*
-*	p_log
-*		[in] Pointer to the log object.
-*
-*	p_lock
-*		[in] Pointer to the OpenSM serializing lock.
-*
-* RETURN VALUES
-*	IB_SUCCESS if the ClassPort Info Receiver object was initialized
-*	successfully.
-*
-* NOTES
-*	Allows calling other ClassPort Info Receiver methods.
-*
-* SEE ALSO
-*	ClassPort Info Receiver object, osm_cpi_rcv_construct,
-*	osm_cpi_rcv_destroy
-*********/
-
-/****f* OpenSM: ClassPort Info Receiver/osm_cpi_rcv_process
-* NAME
-*	osm_cpi_rcv_process
-*
-* DESCRIPTION
-*	Process the ClassPortInfo request.
-*
-* SYNOPSIS
-*/
-void osm_cpi_rcv_process(IN void *context, IN void *data);
-/*
-* PARAMETERS
-*	context
-*		[in] Pointer to an osm_cpi_rcv_t object.
-*
-*	data
-*		[in] Pointer to the MAD Wrapper containing the MAD
-*		that contains the ClassPortInfo attribute.
-*
-* RETURN VALUES
-*	IB_SUCCESS if the ClassPortInfo processing was successful.
-*
-* NOTES
-*	This function processes a ClassPortInfo attribute.
-*
-* SEE ALSO
-*	ClassPort Info Receiver, ClassPort Info Response Controller
-*********/
-
-END_C_DECLS
-#endif				/* _OSM_CPI_H_ */
diff --git a/opensm/include/opensm/osm_sa_guidinfo_record.h b/opensm/include/opensm/osm_sa_guidinfo_record.h
deleted file mode 100644
index c074b7b..0000000
--- a/opensm/include/opensm/osm_sa_guidinfo_record.h
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * Copyright (c) 2006-2007 Voltaire, Inc. All rights reserved.
- * Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
- * Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
- *
- * This software is available to you under a choice of one of two
- * licenses.  You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
- *
- *     Redistribution and use in source and binary forms, with or
- *     without modification, are permitted provided that the following
- *     conditions are met:
- *
- *      - Redistributions of source code must retain the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-/*
- * Abstract:
- * 	Declaration of osm_gir_rcv_t.
- *	This object represents the GUIDInfo Record Receiver object.
- *	This object is part of the OpenSM family of objects.
- *
- * Environment:
- * 	Linux User Mode
- *
- */
-
-#ifndef _OSM_GIR_RCV_H_
-#define _OSM_GIR_RCV_H_
-
-#include <complib/cl_passivelock.h>
-#include <opensm/osm_base.h>
-#include <opensm/osm_madw.h>
-#include <opensm/osm_sa_response.h>
-#include <opensm/osm_subnet.h>
-#include <opensm/osm_port.h>
-#include <opensm/osm_log.h>
-
-#ifdef __cplusplus
-#  define BEGIN_C_DECLS extern "C" {
-#  define END_C_DECLS   }
-#else				/* !__cplusplus */
-#  define BEGIN_C_DECLS
-#  define END_C_DECLS
-#endif				/* __cplusplus */
-
-BEGIN_C_DECLS
-/****h* OpenSM/GUIDInfo Record Receiver
-* NAME
-*	GUIDInfo Record Receiver
-*
-* DESCRIPTION
-*	The GUIDInfo Record Receiver object encapsulates the information
-*	needed to receive the GUIDInfoRecord attribute from a node.
-*
-*	The GUIDInfo Record Receiver object is thread safe.
-*
-*	This object should be treated as opaque and should be
-*	manipulated only through the provided functions.
-*
-* AUTHOR
-*	Hal Rosenstock, Voltaire
-*
-*********/
-/****s* OpenSM: GUIDInfo Record Receiver/osm_gir_rcv_t
-* NAME
-*	osm_gir_rcv_t
-*
-* DESCRIPTION
-*	GUIDInfo Record Receiver structure.
-*
-*	This object should be treated as opaque and should
-*	be manipulated only through the provided functions.
-*
-* SYNOPSIS
-*/
-typedef struct _osm_gir_rcv {
-	osm_subn_t *p_subn;
-	osm_sa_resp_t *p_resp;
-	osm_mad_pool_t *p_mad_pool;
-	osm_log_t *p_log;
-	cl_plock_t *p_lock;
-} osm_gir_rcv_t;
-/*
-* FIELDS
-*	p_subn
-*		Pointer to the Subnet object for this subnet.
-*
-*	p_resp
-*		Pointer to the SA responder.
-*
-*	p_mad_pool
-*		Pointer to the mad pool.
-*
-*	p_log
-*		Pointer to the log object.
-*
-*	p_lock
-*		Pointer to the serializing lock.
-*
-* SEE ALSO
-*
-*********/
-
-/****f* OpenSM: GUIDInfo Record Receiver/osm_gir_rcv_construct
-* NAME
-*	osm_gir_rcv_construct
-*
-* DESCRIPTION
-*	This function constructs a GUIDInfo Record Receiver object.
-*
-* SYNOPSIS
-*/
-void osm_gir_rcv_construct(IN osm_gir_rcv_t * const p_rcv);
-/*
-* PARAMETERS
-*	p_rcv
-*		[in] Pointer to a GUIDInfo Record Receiver object to construct.
-*
-* RETURN VALUE
-*	This function does not return a value.
-*
-* NOTES
-*	Allows calling osm_gir_rcv_init, osm_gir_rcv_destroy
-*
-*	Calling osm_gir_rcv_construct is a prerequisite to calling any other
-*	method except osm_gir_rcv_init.
-*
-* SEE ALSO
-*	GUIDInfo Record Receiver object, osm_gir_rcv_init,
-*	osm_gir_rcv_destroy
-*********/
-
-/****f* OpenSM: GUIDInfo Record Receiver/osm_gir_rcv_destroy
-* NAME
-*	osm_gir_rcv_destroy
-*
-* DESCRIPTION
-*	The osm_gir_rcv_destroy function destroys the object, releasing
-*	all resources.
-*
-* SYNOPSIS
-*/
-void osm_gir_rcv_destroy(IN osm_gir_rcv_t * const p_rcv);
-/*
-* PARAMETERS
-*	p_rcv
-*		[in] Pointer to the object to destroy.
-*
-* RETURN VALUE
-*	This function does not return a value.
-*
-* NOTES
-*	Performs any necessary cleanup of the specified
-*	GUIDInfo Record Receiver object.
-*	Further operations should not be attempted on the destroyed object.
-*	This function should only be called after a call to
-*	osm_gir_rcv_construct or osm_gir_rcv_init.
-*
-* SEE ALSO
-*	GUIDInfo Record Receiver object, osm_gir_rcv_construct,
-*	osm_gir_rcv_init
-*********/
-
-/****f* OpenSM: GUIDInfo Record Receiver/osm_gir_rcv_init
-* NAME
-*	osm_gir_rcv_init
-*
-* DESCRIPTION
-*	The osm_gir_rcv_init function initializes a
-*	GUIDInfo Record Receiver object for use.
-*
-* SYNOPSIS
-*/
-ib_api_status_t
-osm_gir_rcv_init(IN osm_gir_rcv_t * const p_rcv,
-		 IN osm_sa_resp_t * const p_resp,
-		 IN osm_mad_pool_t * const p_mad_pool,
-		 IN osm_subn_t * const p_subn,
-		 IN osm_log_t * const p_log, IN cl_plock_t * const p_lock);
-/*
-* PARAMETERS
-*	p_rcv
-*		[in] Pointer to an osm_gir_rcv_t object to initialize.
-*
-*	p_req
-*		[in] Pointer to an osm_req_t object.
-*
-*	p_subn
-*		[in] Pointer to the Subnet object for this subnet.
-*
-*	p_log
-*		[in] Pointer to the log object.
-*
-*	p_lock
-*		[in] Pointer to the OpenSM serializing lock.
-*
-* RETURN VALUES
-*	CL_SUCCESS if the GUIDInfo Record Receiver object was initialized
-*	successfully.
-*
-* NOTES
-*	Allows calling other GUIDInfo Record Receiver methods.
-*
-* SEE ALSO
-*	GUIDInfo Record Receiver object, osm_gir_rcv_construct,
-*	osm_gir_rcv_destroy
-*********/
-
-/****f* OpenSM: GUIDInfo Record Receiver/osm_gir_rcv_process
-* NAME
-*	osm_gir_rcv_process
-*
-* DESCRIPTION
-*	Process the GUIDInfoRecord attribute.
-*
-* SYNOPSIS
-*/
-void osm_gir_rcv_process(IN void *context, IN void *data);
-/*
-* PARAMETERS
-*	context
-*		[in] Pointer to an osm_gir_rcv_t object.
-*
-*	data
-*		[in] Pointer to the MAD Wrapper containing the MAD
-*		that contains the node's GUIDInfoRecord attribute.
-*
-* RETURN VALUES
-*	CL_SUCCESS if the GUIDInfoRecord processing was successful.
-*
-* NOTES
-*	This function processes a GUIDInfoRecord attribute.
-*
-* SEE ALSO
-*	GUIDInfo Record Receiver, GUIDInfo Record Response Controller
-*********/
-
-END_C_DECLS
-#endif				/* _OSM_GIR_RCV_H_ */
diff --git a/opensm/include/opensm/osm_sa_informinfo.h b/opensm/include/opensm/osm_sa_informinfo.h
deleted file mode 100644
index 2a4b4ba..0000000
--- a/opensm/include/opensm/osm_sa_informinfo.h
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * Copyright (c) 2004-2007 Voltaire, Inc. All rights reserved.
- * Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
- * Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
- *
- * This software is available to you under a choice of one of two
- * licenses.  You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
- *
- *     Redistribution and use in source and binary forms, with or
- *     without modification, are permitted provided that the following
- *     conditions are met:
- *
- *      - Redistributions of source code must retain the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-/*
- * Abstract:
- * 	Declaration of osm_infr_rcv_t.
- *	This object represents the InformInfoRecord Receiver object.
- *	attribute from a node.
- *	This object is part of the OpenSM family of objects.
- *
- * Environment:
- * 	Linux User Mode
- *
- * $Revision: 1.3 $
- */
-
-#ifndef _OSM_SA_INFR_H_
-#define _OSM_SA_INFR_H_
-
-#include <complib/cl_passivelock.h>
-#include <opensm/osm_base.h>
-#include <opensm/osm_madw.h>
-#include <opensm/osm_sa_response.h>
-#include <opensm/osm_subnet.h>
-#include <opensm/osm_port.h>
-#include <opensm/osm_log.h>
-
-#ifdef __cplusplus
-#  define BEGIN_C_DECLS extern "C" {
-#  define END_C_DECLS   }
-#else				/* !__cplusplus */
-#  define BEGIN_C_DECLS
-#  define END_C_DECLS
-#endif				/* __cplusplus */
-
-BEGIN_C_DECLS
-/****h* OpenSM/InformInfo Receiver
-* NAME
-*	InformInfo Receiver
-*
-* DESCRIPTION
-*	The InformInfo Receiver object encapsulates the information
-*	needed to receive the InformInfo request from a node.
-*
-*	The InformInfo Receiver object is thread safe.
-*
-*	This object should be treated as opaque and should be
-*	manipulated only through the provided functions.
-*
-* AUTHOR
-*	Eitan Zahavi, Mellanox
-*
-*********/
-/****s* OpenSM: InformInfo Receiver/osm_infr_rcv_t
-* NAME
-*	osm_infr_rcv_t
-*
-* DESCRIPTION
-*	InformInfo Receiver structure.
-*
-*	This object should be treated as opaque and should
-*	be manipulated only through the provided functions.
-*
-* SYNOPSIS
-*/
-typedef struct _osm_infr_rcv {
-	osm_subn_t *p_subn;
-	osm_sa_resp_t *p_resp;
-	osm_mad_pool_t *p_mad_pool;
-	osm_log_t *p_log;
-	cl_plock_t *p_lock;
-} osm_infr_rcv_t;
-/*
-* FIELDS
-*	p_subn
-*		Pointer to the Subnet object for this subnet.
-*
-*	p_resp
-*		Pointer to the osm_sa_resp_t object.
-*
-*	p_log
-*		Pointer to the log object.
-*
-*	p_lock
-*		Pointer to the serializing lock.
-*
-* SEE ALSO
-*	InformInfo Receiver object
-*********/
-
-/****f* OpenSM: InformInfo Receiver/osm_infr_rcv_construct
-* NAME
-*	osm_infr_rcv_construct
-*
-* DESCRIPTION
-*	This function constructs a InformInfo Receiver object.
-*
-* SYNOPSIS
-*/
-void osm_infr_rcv_construct(IN osm_infr_rcv_t * const p_rcv);
-/*
-* PARAMETERS
-*	p_rcv
-*		[in] Pointer to a InformInfo Receiver object to construct.
-*
-* RETURN VALUE
-*	This function does not return a value.
-*
-* NOTES
-*	Allows calling osm_infr_rcv_init, osm_infr_rcv_destroy
-*
-*	Calling osm_infr_rcv_construct is a prerequisite to calling any other
-*	method except osm_infr_rcv_init.
-*
-* SEE ALSO
-*	InformInfo Receiver object, osm_infr_rcv_init, osm_infr_rcv_destroy
-*********/
-
-/****f* OpenSM: InformInfo Receiver/osm_infr_rcv_destroy
-* NAME
-*	osm_infr_rcv_destroy
-*
-* DESCRIPTION
-*	The osm_infr_rcv_destroy function destroys the object, releasing
-*	all resources.
-*
-* SYNOPSIS
-*/
-void osm_infr_rcv_destroy(IN osm_infr_rcv_t * const p_rcv);
-/*
-* PARAMETERS
-*	p_rcv
-*		[in] Pointer to the object to destroy.
-*
-* RETURN VALUE
-*	This function does not return a value.
-*
-* NOTES
-*	Performs any necessary cleanup of the specified
-*	InformInfo Receiver object.
-*	Further operations should not be attempted on the destroyed object.
-*	This function should only be called after a call to
-*	osm_infr_rcv_construct or osm_infr_rcv_init.
-*
-* SEE ALSO
-*	InformInfo Receiver object, osm_infr_rcv_construct,
-*	osm_infr_rcv_init
-*********/
-
-/****f* OpenSM: InformInfo Receiver/osm_infr_rcv_init
-* NAME
-*	osm_infr_rcv_init
-*
-* DESCRIPTION
-*	The osm_infr_rcv_init function initializes a
-*	InformInfo Receiver object for use.
-*
-* SYNOPSIS
-*/
-ib_api_status_t
-osm_infr_rcv_init(IN osm_infr_rcv_t * const p_rcv,
-		  IN osm_sa_resp_t * const p_resp,
-		  IN osm_mad_pool_t * const p_mad_pool,
-		  IN osm_subn_t * const p_subn,
-		  IN osm_log_t * const p_log, IN cl_plock_t * const p_lock);
-/*
-* PARAMETERS
-*	p_rcv
-*		[in] Pointer to an osm_infr_rcv_t object to initialize.
-*
-*	p_subn
-*		[in] Pointer to the Subnet object for this subnet.
-*
-*	p_log
-*		[in] Pointer to the log object.
-*
-*	p_lock
-*		[in] Pointer to the OpenSM serializing lock.
-*
-* RETURN VALUES
-*	IB_SUCCESS if the InformInfo Receiver object was initialized
-*	successfully.
-*
-* NOTES
-*	Allows calling other InformInfo Receiver methods.
-*
-* SEE ALSO
-*	InformInfo Receiver object, osm_infr_rcv_construct,
-*	osm_infr_rcv_destroy
-*********/
-
-/****f* OpenSM: InformInfo Receiver/osm_infr_rcv_process
-* NAME
-*	osm_infr_rcv_process
-*
-* DESCRIPTION
-*	Process the InformInfo request.
-*
-* SYNOPSIS
-*/
-void osm_infr_rcv_process(IN void *context, IN void *data);
-/*
-* PARAMETERS
-*	context
-*		[in] Pointer to an osm_infr_rcv_t object.
-*
-*	data
-*		[in] Pointer to the MAD Wrapper containing the MAD
-*		that contains the node's InformInfo attribute.
-* NOTES
-*	This function processes a InformInfo attribute.
-*
-* SEE ALSO
-*	InformInfo Receiver
-*********/
-
-/****f* OpenSM: InformInfo Record Receiver/osm_infir_rcv_process
-* NAME
-*	osm_infir_rcv_process
-*
-* DESCRIPTION
-*	Process the InformInfo Record request.
-*
-* SYNOPSIS
-*/
-void osm_infir_rcv_process(IN void *context, IN void *data);
-/*
-* PARAMETERS
-*	context
-*		[in] Pointer to an osm_infr_rcv_t object.
-*
-*	data
-*		[in] Pointer to the MAD Wrapper containing the MAD
-*		that contains the node's InformInfo Record attribute.
-* NOTES
-*	This function processes a InformInfo Record attribute.
-*
-* SEE ALSO
-*	InformInfo Receiver
-*********/
-
-END_C_DECLS
-#endif				/* _OSM_SA_INFR_H_ */
diff --git a/opensm/include/opensm/osm_sa_lft_record.h b/opensm/include/opensm/osm_sa_lft_record.h
deleted file mode 100644
index 8470490..0000000
--- a/opensm/include/opensm/osm_sa_lft_record.h
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * Copyright (c) 2004-2007 Voltaire, Inc. All rights reserved.
- * Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
- * Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
- *
- * This software is available to you under a choice of one of two
- * licenses.  You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
- *
- *     Redistribution and use in source and binary forms, with or
- *     without modification, are permitted provided that the following
- *     conditions are met:
- *
- *      - Redistributions of source code must retain the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-/*
- * Abstract:
- * 	Declaration of osm_lftr_rcv_t.
- *	This object represents the LinearForwardingTable Receiver object.
- *	attribute from a switch node.
- *	This object is part of the OpenSM family of objects.
- *
- * Environment:
- * 	Linux User Mode
- *
- * $Revision: 1.4 $
- */
-
-#ifndef _OSM_LFTR_H_
-#define _OSM_LFTR_H_
-
-#include <complib/cl_passivelock.h>
-#include <opensm/osm_base.h>
-#include <opensm/osm_madw.h>
-#include <opensm/osm_sa_response.h>
-#include <opensm/osm_subnet.h>
-#include <opensm/osm_stats.h>
-#include <opensm/osm_log.h>
-
-#ifdef __cplusplus
-#  define BEGIN_C_DECLS extern "C" {
-#  define END_C_DECLS   }
-#else				/* !__cplusplus */
-#  define BEGIN_C_DECLS
-#  define END_C_DECLS
-#endif				/* __cplusplus */
-
-BEGIN_C_DECLS
-/****h* OpenSM/Linear Forwarding Table Receiver
-* NAME
-*	Linear Forwarding Table Receiver
-*
-* DESCRIPTION
-*	The Linear Forwarding Table Receiver object encapsulates the information
-*	needed to receive the LinearForwardingTable attribute from a switch node.
-*
-*	The Linear Forwarding Table Receiver object is thread safe.
-*
-*	This object should be treated as opaque and should be
-*	manipulated only through the provided functions.
-*
-* AUTHOR
-*	Eitan Zahavi, Mellanox Technologies LTD
-*
-*********/
-/****s* OpenSM: Linear Forwarding Table Receiver/osm_lftr_rcv_t
-* NAME
-*	osm_lftr_rcv_t
-*
-* DESCRIPTION
-*	Linear Forwarding Table Receiver structure.
-*
-*	This object should be treated as opaque and should
-*	be manipulated only through the provided functions.
-*
-* SYNOPSIS
-*/
-typedef struct _osm_lft {
-	osm_subn_t *p_subn;
-	osm_stats_t *p_stats;
-	osm_sa_resp_t *p_resp;
-	osm_mad_pool_t *p_mad_pool;
-	osm_log_t *p_log;
-	cl_plock_t *p_lock;
-} osm_lftr_rcv_t;
-/*
-* FIELDS
-*	p_subn
-*		Pointer to the Subnet object for this subnet.
-*
-*	p_stats
-*		Pointer to the statistics.
-*
-*	p_resp
-*		Pointer to the SA responder.
-*
-*	p_mad_pool
-*		Pointer to the mad pool.
-*
-*	p_log
-*		Pointer to the log object.
-*
-*	p_lock
-*		Pointer to the serializing lock.
-*
-* SEE ALSO
-*	Linear Forwarding Table Receiver object
-*********/
-
-/****f* OpenSM: Linear Forwarding Table Receiver/osm_lftr_rcv_construct
-* NAME
-*	osm_lftr_rcv_construct
-*
-* DESCRIPTION
-*	This function constructs a Linear Forwarding Table Receiver object.
-*
-* SYNOPSIS
-*/
-void osm_lftr_rcv_construct(IN osm_lftr_rcv_t * const p_ctrl);
-/*
-* PARAMETERS
-*	p_ctrl
-*		[in] Pointer to a Linear Forwarding Table Receiver object to construct.
-*
-* RETURN VALUE
-*	This function does not return a value.
-*
-* NOTES
-*	Allows calling osm_lftr_rcv_init, osm_lftr_rcv_destroy
-*
-*	Calling osm_lftr_rcv_construct is a prerequisite to calling any other
-*	method except osm_lftr_rcv_init.
-*
-* SEE ALSO
-*	Linear Forwarding Table Receiver object, osm_lftr_rcv_init,
-*  osm_lftr_rcv_destroy
-*********/
-
-/****f* OpenSM: Linear Forwarding Table Receiver/osm_lftr_rcv_destroy
-* NAME
-*	osm_lftr_rcv_destroy
-*
-* DESCRIPTION
-*	The osm_lftr_rcv_destroy function destroys the object, releasing
-*	all resources.
-*
-* SYNOPSIS
-*/
-void osm_lftr_rcv_destroy(IN osm_lftr_rcv_t * const p_ctrl);
-/*
-* PARAMETERS
-*	p_ctrl
-*		[in] Pointer to the object to destroy.
-*
-* RETURN VALUE
-*	This function does not return a value.
-*
-* NOTES
-*	Performs any necessary cleanup of the specified
-*	Linear Forwarding Table Receiver object.
-*	Further operations should not be attempted on the destroyed object.
-*	This function should only be called after a call to
-*	osm_lftr_rcv_construct or osm_lftr_rcv_init.
-*
-* SEE ALSO
-*	Linear Forwarding Table Receiver object, osm_lftr_rcv_construct,
-*	osm_lftr_rcv_init
-*********/
-
-/****f* OpenSM: Linear Forwarding Table Receiver/osm_lftr_rcv_init
-* NAME
-*	osm_lftr_rcv_init
-*
-* DESCRIPTION
-*	The osm_lftr_rcv_init function initializes a
-*	Linear Forwarding Table Receiver object for use.
-*
-* SYNOPSIS
-*/
-ib_api_status_t osm_lftr_rcv_init(IN osm_lftr_rcv_t * const p_rcv,
-				  IN osm_sa_resp_t * const p_resp,
-				  IN osm_mad_pool_t * const p_mad_pool,
-				  IN osm_subn_t * const p_subn,
-				  IN osm_log_t * const p_log,
-				  IN cl_plock_t * const p_lock);
-/*
-* PARAMETERS
-*	p_rcv
-*		[in] Pointer to an osm_lftr_rcv_t object to initialize.
-*
-*	p_req
-*		[in] Pointer to an osm_req_t object.
-*
-*	p_subn
-*		[in] Pointer to the Subnet object for this subnet.
-*
-*	p_log
-*		[in] Pointer to the log object.
-*
-*	p_lock
-*		[in] Pointer to the OpenSM serializing lock.
-*
-* RETURN VALUES
-*	CL_SUCCESS if the Linear Forwarding Table Receiver object was initialized
-*	successfully.
-*
-* NOTES
-*	Allows calling other Linear Forwarding Table Receiver methods.
-*
-* SEE ALSO
-*	Linear Forwarding Table Receiver object, osm_lftr_rcv_construct,
-*  osm_lftr_rcv_destroy
-*********/
-
-/****f* OpenSM: Linear Forwarding Table Receiver/osm_lftr_rcv_process
-* NAME
-*	osm_lftr_rcv_process
-*
-* DESCRIPTION
-*	Process the LinearForwardingTable attribute.
-*
-* SYNOPSIS
-*/
-void osm_lftr_rcv_process(IN void *context, IN void *data);
-/*
-* PARAMETERS
-*	context
-*		[in] Pointer to an osm_lftr_rcv_t object.
-*
-*	data
-*		[in] Pointer to the MAD Wrapper containing the MAD
-*		that contains the switch node's LinearForwardingTable attribute.
-*
-* RETURN VALUES
-*	CL_SUCCESS if the LinearForwardingTable processing was successful.
-*
-* NOTES
-*	This function processes a LinearForwardingTable attribute.
-*
-* SEE ALSO
-*	Linear Forwarding Table Receiver, Linear Forwarding Table Response
-*  Controller
-*********/
-
-END_C_DECLS
-#endif				/* _OSM_LFTR_H_ */
diff --git a/opensm/include/opensm/osm_sa_link_record.h b/opensm/include/opensm/osm_sa_link_record.h
deleted file mode 100644
index d09eb69..0000000
--- a/opensm/include/opensm/osm_sa_link_record.h
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Copyright (c) 2004-2007 Voltaire, Inc. All rights reserved.
- * Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
- * Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
- *
- * This software is available to you under a choice of one of two
- * licenses.  You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
- *
- *     Redistribution and use in source and binary forms, with or
- *     without modification, are permitted provided that the following
- *     conditions are met:
- *
- *      - Redistributions of source code must retain the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-/*
- * Abstract:
- * 	Declaration of osm_lr_rcv_t.
- *	This object represents the Link Record Receiver object.
- *	attribute from a node.
- *	This object is part of the OpenSM family of objects.
- *
- * Environment:
- * 	Linux User Mode
- *
- * $Revision: 1.4 $
- */
-
-#ifndef _OSM_LR_RCV_H_
-#define _OSM_LR_RCV_H_
-
-#include <complib/cl_passivelock.h>
-#include <opensm/osm_base.h>
-#include <opensm/osm_madw.h>
-#include <opensm/osm_mad_pool.h>
-#include <opensm/osm_sa_response.h>
-#include <opensm/osm_subnet.h>
-#include <opensm/osm_log.h>
-
-#ifdef __cplusplus
-#  define BEGIN_C_DECLS extern "C" {
-#  define END_C_DECLS   }
-#else				/* !__cplusplus */
-#  define BEGIN_C_DECLS
-#  define END_C_DECLS
-#endif				/* __cplusplus */
-
-BEGIN_C_DECLS
-/****h* OpenSM/Link Record Receiver
-* NAME
-*	Link Record Receiver
-*
-* DESCRIPTION
-*	The Link Record Receiver object encapsulates the information
-*	needed to receive the Link Record attribute from a node.
-*
-*	The Link Record Receiver object is thread safe.
-*
-*	This object should be treated as opaque and should be
-*	manipulated only through the provided functions.
-*
-* AUTHOR
-*	Ranjit Pandit, Intel
-*
-*********/
-/****s* OpenSM: Link Record Receiver/osm_lr_rcv_t
-* NAME
-*	osm_lr_rcv_t
-*
-* DESCRIPTION
-*	Link Record Receiver structure.
-*
-*	This object should be treated as opaque and should
-*	be manipulated only through the provided functions.
-*
-* SYNOPSIS
-*/
-typedef struct _osm_lr_rcv {
-	osm_subn_t *p_subn;
-	osm_sa_resp_t *p_resp;
-	osm_mad_pool_t *p_mad_pool;
-	osm_log_t *p_log;
-	cl_plock_t *p_lock;
-} osm_lr_rcv_t;
-/*
-* FIELDS
-*	p_subn
-*		Pointer to the Subnet object for this subnet.
-*
-*	p_resp
-*		Pointer to the SA responder.
-*
-*	p_mad_pool
-*		Pointer to the mad pool.
-*
-*	p_log
-*		Pointer to the log object.
-*
-*	p_lock
-*		Pointer to the serializing lock.
-*
-* SEE ALSO
-*********/
-
-/****f* OpenSM: Link Record Receiver/osm_lr_rcv_construct
-* NAME
-*	osm_lr_rcv_construct
-*
-* DESCRIPTION
-*	This function constructs a Link Record Receiver object.
-*
-* SYNOPSIS
-*/
-void osm_lr_rcv_construct(IN osm_lr_rcv_t * const p_rcv);
-/*
-* PARAMETERS
-*	p_rcv
-*		[in] Pointer to a Link Record Receiver object to construct.
-*
-* RETURN VALUE
-*	This function does not return a value.
-*
-* NOTES
-*	Allows calling osm_lr_rcv_init, osm_lr_rcv_destroy
-*
-*	Calling osm_lr_rcv_construct is a prerequisite to calling any other
-*	method except osm_lr_rcv_init.
-*
-* SEE ALSO
-*	Link Record Receiver object, osm_lr_rcv_init, osm_lr_rcv_destroy
-*********/
-
-/****f* OpenSM: Link Record Receiver/osm_lr_rcv_destroy
-* NAME
-*	osm_lr_rcv_destroy
-*
-* DESCRIPTION
-*	The osm_lr_rcv_destroy function destroys the object, releasing
-*	all resources.
-*
-* SYNOPSIS
-*/
-void osm_lr_rcv_destroy(IN osm_lr_rcv_t * const p_rcv);
-/*
-* PARAMETERS
-*	p_rcv
-*		[in] Pointer to the object to destroy.
-*
-* RETURN VALUE
-*	This function does not return a value.
-*
-* NOTES
-*	Performs any necessary cleanup of the specified
-*	Link Record Receiver object.
-*	Further operations should not be attempted on the destroyed object.
-*	This function should only be called after a call to
-*	osm_lr_rcv_construct or osm_lr_rcv_init.
-*
-* SEE ALSO
-*	Link Record Receiver object, osm_lr_rcv_construct,
-*	osm_lr_rcv_init
-*********/
-
-/****f* OpenSM: Link Record Receiver/osm_lr_rcv_init
-* NAME
-*	osm_lr_rcv_init
-*
-* DESCRIPTION
-*	The osm_lr_rcv_init function initializes a
-*	Link Record Receiver object for use.
-*
-* SYNOPSIS
-*/
-ib_api_status_t
-osm_lr_rcv_init(IN osm_lr_rcv_t * const p_rcv,
-		IN osm_sa_resp_t * const p_resp,
-		IN osm_mad_pool_t * const p_mad_pool,
-		IN osm_subn_t * const p_subn,
-		IN osm_log_t * const p_log, IN cl_plock_t * const p_lock);
-/*
-* PARAMETERS
-*	p_rcv
-*		[in] Pointer to an osm_lr_rcv_t object to initialize.
-*
-*	p_resp
-*		[in] Pointer to the SA Responder object.
-*
-*	p_mad_pool
-*		[in] Pointer to the mad pool.
-*
-*	p_subn
-*		[in] Pointer to the Subnet object for this subnet.
-*
-*	p_log
-*		[in] Pointer to the log object.
-*
-*	p_lock
-*		[in] Pointer to the OpenSM serializing lock.
-*
-* RETURN VALUES
-*	IB_SUCCESS if the Link Record Receiver object was initialized
-*	successfully.
-*
-* NOTES
-*	Allows calling other Link Record Receiver methods.
-*
-* SEE ALSO
-*	Link Record Receiver object, osm_lr_rcv_construct, osm_lr_rcv_destroy
-*********/
-
-/****f* OpenSM: Link Record Receiver/osm_lr_rcv_process
-* NAME
-*	osm_lr_rcv_process
-*
-* DESCRIPTION
-*	Process the Link Record attribute.
-*
-* SYNOPSIS
-*/
-void osm_lr_rcv_process(IN void *context, IN void *data);
-/*
-* PARAMETERS
-*	context
-*		[in] Pointer to an osm_lr_rcv_t object.
-*
-*	data
-*		[in] Pointer to the MAD Wrapper containing the MAD
-*		that contains the node's Link Record attribute.
-*
-* NOTES
-*	This function processes a Link Record attribute.
-*
-* SEE ALSO
-*	Link Record Receiver, Link Record Response Controller
-*********/
-
-END_C_DECLS
-#endif				/* _OSM_LR_RCV_H_ */
diff --git a/opensm/include/opensm/osm_sa_mcmember_record.h b/opensm/include/opensm/osm_sa_mcmember_record.h
deleted file mode 100644
index 09db580..0000000
--- a/opensm/include/opensm/osm_sa_mcmember_record.h
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
- * Copyright (c) 2004-2007 Voltaire, Inc. All rights reserved.
- * Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
- * Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
- *
- * This software is available to you under a choice of one of two
- * licenses.  You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
- *
- *     Redistribution and use in source and binary forms, with or
- *     without modification, are permitted provided that the following
- *     conditions are met:
- *
- *      - Redistributions of source code must retain the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-/*
- * Abstract:
- * 	Declaration of osm_mcmr_recv_t.
- *	This object represents the MCMemberRecord Receiver object.
- *	attribute from a node.
- *	This object is part of the OpenSM family of objects.
- *
- * Environment:
- * 	Linux User Mode
- *
- * $Revision: 1.7 $
- */
-
-#ifndef _OSM_MCMR_H_
-#define _OSM_MCMR_H_
-
-#include <complib/cl_passivelock.h>
-#include <opensm/osm_base.h>
-#include <opensm/osm_madw.h>
-#include <opensm/osm_sa_response.h>
-#include <opensm/osm_subnet.h>
-#include <opensm/osm_sm.h>
-#include <opensm/osm_multicast.h>
-#include <opensm/osm_log.h>
-
-#ifdef __cplusplus
-#  define BEGIN_C_DECLS extern "C" {
-#  define END_C_DECLS   }
-#else				/* !__cplusplus */
-#  define BEGIN_C_DECLS
-#  define END_C_DECLS
-#endif				/* __cplusplus */
-
-BEGIN_C_DECLS
-/****h* OpenSM/MCMember Receiver
-* NAME
-*	MCMember Receiver
-*
-* DESCRIPTION
-*	The MCMember Receiver object encapsulates the information
-*	needed to receive the MCMemberRecord attribute from a node.
-*
-*	The MCMember Receiver object is thread safe.
-*
-*	This object should be treated as opaque and should be
-*	manipulated only through the provided functions.
-*
-* AUTHOR
-*	Anil Keshavamurthy, Intel
-*
-*********/
-/****s* OpenSM: MCMember Receiver/osm_mcmr_recv_t
-* NAME
-*	osm_mcmr_recv_t
-*
-* DESCRIPTION
-*	MCMember Receiver structure.
-*
-*	This object should be treated as opaque and should
-*	be manipulated only through the provided functions.
-*
-* SYNOPSIS
-*/
-typedef struct _osm_mcmr {
-	osm_subn_t *p_subn;
-	osm_sm_t *p_sm;
-	osm_sa_resp_t *p_resp;
-	osm_mad_pool_t *p_mad_pool;
-	osm_log_t *p_log;
-	cl_plock_t *p_lock;
-} osm_mcmr_recv_t;
-
-/*
-* FIELDS
-*	p_subn
-*		Pointer to the Subnet object for this subnet.
-*
-*	p_gen_req_ctrl
-*		Pointer to the generic request controller.
-*
-*	p_log
-*		Pointer to the log object.
-*
-*	p_lock
-*		Pointer to the serializing lock.
-*
-* SEE ALSO
-*	MCMember Receiver object
-*********/
-
-/****f* OpenSM: MCMember Receiver/osm_mcmr_rcv_construct
-* NAME
-*	osm_mcmr_rcv_construct
-*
-* DESCRIPTION
-*	This function constructs a MCMember Receiver object.
-*
-* SYNOPSIS
-*/
-void osm_mcmr_rcv_construct(IN osm_mcmr_recv_t * const p_ctrl);
-/*
-* PARAMETERS
-*	p_ctrl
-*		[in] Pointer to a MCMember Receiver object to construct.
-*
-* RETURN VALUE
-*	This function does not return a value.
-*
-* NOTES
-*	Allows calling osm_mcmr_rcv_init, osm_mcmr_rcv_destroy
-*
-*	Calling osm_mcmr_rcv_construct is a prerequisite to calling any other
-*	method except osm_mcmr_init.
-*
-* SEE ALSO
-*	MCMember Receiver object, osm_mcmr_init,
-*	osm_mcmr_rcv_destroy
-*********/
-
-/****f* OpenSM: MCMember Receiver/osm_mcmr_rcv_destroy
-* NAME
-*	osm_mcmr_rcv_destroy
-*
-* DESCRIPTION
-*	The osm_mcmr_rcv_destroy function destroys the object, releasing
-*	all resources.
-*
-* SYNOPSIS
-*/
-void osm_mcmr_rcv_destroy(IN osm_mcmr_recv_t * const p_ctrl);
-/*
-* PARAMETERS
-*	p_ctrl
-*		[in] Pointer to the object to destroy.
-*
-* RETURN VALUE
-*	This function does not return a value.
-*
-* NOTES
-*	Performs any necessary cleanup of the specified
-*	MCMember Receiver object.
-*	Further operations should not be attempted on the destroyed object.
-*	This function should only be called after a call to
-*	osm_mcmr_rcv_construct or osm_mcmr_init.
-*
-* SEE ALSO
-*	MCMember Receiver object, osm_mcmr_rcv_construct,
-*	osm_mcmr_init
-*********/
-
-/****f* OpenSM: MCMember Receiver/osm_mcmr_rcv_init
-* NAME
-*	osm_mcmr_init
-*
-* DESCRIPTION
-*	The osm_mcmr_init function initializes a
-*	MCMember Receiver object for use.
-*
-* SYNOPSIS
-*/
-ib_api_status_t osm_mcmr_rcv_init(IN osm_sm_t * const p_sm,
-				  IN osm_mcmr_recv_t * const p_ctrl,
-				  IN osm_sa_resp_t * const p_resp,
-				  IN osm_mad_pool_t * const p_mad_pool,
-				  IN osm_subn_t * const p_subn,
-				  IN osm_log_t * const p_log,
-				  IN cl_plock_t * const p_lock);
-/*
-* PARAMETERS
-*	p_sm
-*		[in] pointer to osm_sm_t object
-*	p_ctrl
-*		[in] Pointer to an osm_mcmr_recv_t object to initialize.
-*
-*	p_req
-*		[in] Pointer to an osm_req_t object.
-*
-*	p_subn
-*		[in] Pointer to the Subnet object for this subnet.
-*
-*	p_log
-*		[in] Pointer to the log object.
-*
-*	p_lock
-*		[in] Pointer to the OpenSM serializing lock.
-*
-* RETURN VALUES
-*	CL_SUCCESS if the MCMember Receiver object was initialized
-*	successfully.
-*
-* NOTES
-*	Allows calling other MCMember Receiver methods.
-*
-* SEE ALSO
-*	MCMember Receiver object, osm_mcmr_rcv_construct,
-*	osm_mcmr_rcv_destroy
-*********/
-
-/****f* OpenSM: MCMember Receiver/osm_mcmr_rcv_process
-* NAME
-*	osm_mcmr_rcv_process
-*
-* DESCRIPTION
-*	Process the MCMemberRecord attribute.
-*
-* SYNOPSIS
-*/
-void osm_mcmr_rcv_process(IN void *context, IN void *data);
-/*
-* PARAMETERS
-*	context
-*		[in] Pointer to an osm_mcmr_recv_t object.
-*
-*	data
-*		[in] Pointer to the MAD Wrapper containing the MAD
-*		that contains the node's MCMemberRecord attribute.
-*
-* RETURN VALUES
-*	CL_SUCCESS if the MCMemberRecord processing was successful.
-*
-* NOTES
-*	This function processes a MCMemberRecord attribute.
-*
-* SEE ALSO
-*	MCMember Receiver, MCMember Response Controller
-*********/
-
-/****f* OpenSM: MC Member Record Receiver/osm_mcmr_rcv_create_new_mgrp
-* NAME
-*	osm_mcmr_rcv_create_new_mgrp
-*
-* DESCRIPTION
-*	Create new Multicast group
-*
-* SYNOPSIS
-*/
-
-ib_api_status_t
-osm_mcmr_rcv_create_new_mgrp(IN osm_mcmr_recv_t * const p_mcmr,
-			     IN uint64_t comp_mask,
-			     IN const ib_member_rec_t *
-			     const p_recvd_mcmember_rec,
-			     IN const osm_physp_t * const p_req_physp,
-			     OUT osm_mgrp_t ** pp_mgrp);
-/*
-* PARAMETERS
-*	p_mcmr
-*		[in] Pointer to an osm_mcmr_recv_t object.
-*	p_recvd_mcmember_rec
-*		[in] Received Multicast member record
-*
-*  p_req_physp
-*     [in] The requesting osm_physp_t object.
-*     NULL if the creation is without a requesting port (e.g - ipoib known mcgroups)
-*
-*	pp_mgrp
-*		[out] pointer the osm_mgrp_t object
-*
-* RETURN VALUES
-*	IB_SUCCESS, IB_ERROR
-*
-* NOTES
-*
-*
-* SEE ALSO
-*
-*********/
-
-END_C_DECLS
-#endif				/* _OSM_MCMR_H_ */
diff --git a/opensm/include/opensm/osm_sa_mft_record.h b/opensm/include/opensm/osm_sa_mft_record.h
deleted file mode 100644
index 09b922d..0000000
--- a/opensm/include/opensm/osm_sa_mft_record.h
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * Copyright (c) 2004-2007 Voltaire, Inc. All rights reserved.
- * Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
- * Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
- *
- * This software is available to you under a choice of one of two
- * licenses.  You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
- *
- *     Redistribution and use in source and binary forms, with or
- *     without modification, are permitted provided that the following
- *     conditions are met:
- *
- *      - Redistributions of source code must retain the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-/*
- * Abstract:
- * 	Declaration of osm_mftr_rcv_t.
- *	This object represents the MulticastForwardingTable Receiver object.
- *	attribute from a switch node.
- *	This object is part of the OpenSM family of objects.
- *
- * Environment:
- * 	Linux User Mode
- *
- */
-
-#ifndef _OSM_MFTR_H_
-#define _OSM_MFTR_H_
-
-#include <complib/cl_passivelock.h>
-#include <opensm/osm_base.h>
-#include <opensm/osm_madw.h>
-#include <opensm/osm_sa_response.h>
-#include <opensm/osm_subnet.h>
-#include <opensm/osm_stats.h>
-#include <opensm/osm_log.h>
-
-#ifdef __cplusplus
-#  define BEGIN_C_DECLS extern "C" {
-#  define END_C_DECLS   }
-#else				/* !__cplusplus */
-#  define BEGIN_C_DECLS
-#  define END_C_DECLS
-#endif				/* __cplusplus */
-
-BEGIN_C_DECLS
-/****h* OpenSM/Multicast Forwarding Table Receiver
-* NAME
-*	Multicast Forwarding Table Receiver
-*
-* DESCRIPTION
-*	The Multicast Forwarding Table Receiver object encapsulates the information
-*	needed to receive the MulticastForwardingTable attribute from a switch node.
-*
-*	The Multicast Forwarding Table Receiver object is thread safe.
-*
-*	This object should be treated as opaque and should be
-*	manipulated only through the provided functions.
-*
-* AUTHOR
-*	Hal Rosenstock, Voltaire
-*
-*********/
-/****s* OpenSM: Multicast Forwarding Table Receiver/osm_mftr_rcv_t
-* NAME
-*	osm_mftr_rcv_t
-*
-* DESCRIPTION
-*	Multicast Forwarding Table Receiver structure.
-*
-*	This object should be treated as opaque and should
-*	be manipulated only through the provided functions.
-*
-* SYNOPSIS
-*/
-typedef struct _osm_mft {
-	osm_subn_t *p_subn;
-	osm_stats_t *p_stats;
-	osm_sa_resp_t *p_resp;
-	osm_mad_pool_t *p_mad_pool;
-	osm_log_t *p_log;
-	cl_plock_t *p_lock;
-} osm_mftr_rcv_t;
-/*
-* FIELDS
-*	p_subn
-*		Pointer to the Subnet object for this subnet.
-*
-*	p_stats
-*		Pointer to the statistics.
-*
-*	p_resp
-*		Pointer to the SA responder.
-*
-*	p_mad_pool
-*		Pointer to the mad pool.
-*
-*	p_log
-*		Pointer to the log object.
-*
-*	p_lock
-*		Pointer to the serializing lock.
-*
-* SEE ALSO
-*	Multicast Forwarding Table Receiver object
-*********/
-
-/****f* OpenSM: Multicast Forwarding Table Receiver/osm_mftr_rcv_construct
-* NAME
-*	osm_mftr_rcv_construct
-*
-* DESCRIPTION
-*	This function constructs a Multicast Forwarding Table Receiver object.
-*
-* SYNOPSIS
-*/
-void osm_mftr_rcv_construct(IN osm_mftr_rcv_t * const p_ctrl);
-/*
-* PARAMETERS
-*	p_ctrl
-*		[in] Pointer to a Multicast Forwarding Table Receiver object to construct.
-*
-* RETURN VALUE
-*	This function does not return a value.
-*
-* NOTES
-*	Allows calling osm_mftr_rcv_init, osm_mftr_rcv_destroy
-*
-*	Calling osm_mftr_rcv_construct is a prerequisite to calling any other
-*	method except osm_mftr_rcv_init.
-*
-* SEE ALSO
-*	Multicast Forwarding Table Receiver object, osm_mftr_rcv_init,
-*  osm_mftr_rcv_destroy
-*********/
-
-/****f* OpenSM: Multicast Forwarding Table Receiver/osm_mftr_rcv_destroy
-* NAME
-*	osm_mftr_rcv_destroy
-*
-* DESCRIPTION
-*	The osm_mftr_rcv_destroy function destroys the object, releasing
-*	all resources.
-*
-* SYNOPSIS
-*/
-void osm_mftr_rcv_destroy(IN osm_mftr_rcv_t * const p_ctrl);
-/*
-* PARAMETERS
-*	p_ctrl
-*		[in] Pointer to the object to destroy.
-*
-* RETURN VALUE
-*	This function does not return a value.
-*
-* NOTES
-*	Performs any necessary cleanup of the specified
-*	Multicast Forwarding Table Receiver object.
-*	Further operations should not be attempted on the destroyed object.
-*	This function should only be called after a call to
-*	osm_mftr_rcv_construct or osm_mftr_rcv_init.
-*
-* SEE ALSO
-*	Multicast Forwarding Table Receiver object, osm_mftr_rcv_construct,
-*	osm_mftr_rcv_init
-*********/
-
-/****f* OpenSM: Multicast Forwarding Table Receiver/osm_mftr_rcv_init
-* NAME
-*	osm_mftr_rcv_init
-*
-* DESCRIPTION
-*	The osm_mftr_rcv_init function initializes a
-*	Multicast Forwarding Table Receiver object for use.
-*
-* SYNOPSIS
-*/
-ib_api_status_t osm_mftr_rcv_init(IN osm_mftr_rcv_t * const p_rcv,
-				  IN osm_sa_resp_t * const p_resp,
-				  IN osm_mad_pool_t * const p_mad_pool,
-				  IN osm_subn_t * const p_subn,
-				  IN osm_log_t * const p_log,
-				  IN cl_plock_t * const p_lock);
-/*
-* PARAMETERS
-*	p_rcv
-*		[in] Pointer to an osm_mftr_rcv_t object to initialize.
-*
-*	p_req
-*		[in] Pointer to an osm_req_t object.
-*
-*	p_subn
-*		[in] Pointer to the Subnet object for this subnet.
-*
-*	p_log
-*		[in] Pointer to the log object.
-*
-*	p_lock
-*		[in] Pointer to the OpenSM serializing lock.
-*
-* RETURN VALUES
-*	CL_SUCCESS if the Multicast Forwarding Table Receiver object was initialized
-*	successfully.
-*
-* NOTES
-*	Allows calling other Multicast Forwarding Table Receiver methods.
-*
-* SEE ALSO
-*	Multicast Forwarding Table Receiver object, osm_mftr_rcv_construct,
-*  osm_mftr_rcv_destroy
-*********/
-
-/****f* OpenSM: Multicast Forwarding Table Receiver/osm_mftr_rcv_process
-* NAME
-*	osm_mftr_rcv_process
-*
-* DESCRIPTION
-*	Process the MulticastForwardingTable attribute.
-*
-* SYNOPSIS
-*/
-void osm_mftr_rcv_process(IN void *context, IN void *data);
-/*
-* PARAMETERS
-*	context
-*		[in] Pointer to an osm_mftr_rcv_t object.
-*
-*	data
-*		[in] Pointer to the MAD Wrapper containing the MAD
-*		that contains the switch node's MulticastForwardingTable attribute.
-*
-* RETURN VALUES
-*	CL_SUCCESS if the MulticastForwardingTable processing was successful.
-*
-* NOTES
-*	This function processes a MulticastForwardingTable attribute.
-*
-* SEE ALSO
-*	Multicast Forwarding Table Receiver, Multicast Forwarding Table Response
-*  Controller
-*********/
-
-END_C_DECLS
-#endif				/* _OSM_MFTR_H_ */
diff --git a/opensm/include/opensm/osm_sa_multipath_record.h b/opensm/include/opensm/osm_sa_multipath_record.h
deleted file mode 100644
index afd407d..0000000
--- a/opensm/include/opensm/osm_sa_multipath_record.h
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * Copyright (c) 2006-2007 Voltaire, Inc. All rights reserved.
- * Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
- * Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
- *
- * This software is available to you under a choice of one of two
- * licenses.  You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
- *
- *     Redistribution and use in source and binary forms, with or
- *     without modification, are permitted provided that the following
- *     conditions are met:
- *
- *      - Redistributions of source code must retain the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-/*
- * Abstract:
- * 	Declaration of osm_mpr_rcv_t.
- *	This object represents the MultiPathRecord Receiver object.
- *	attribute from a node.
- *	This object is part of the OpenSM family of objects.
- *
- * Environment:
- * 	Linux User Mode
- *
- */
-
-#ifndef _OSM_MPR_RCV_H_
-#define _OSM_MPR_RCV_H_
-
-#include <complib/cl_passivelock.h>
-#include <opensm/osm_base.h>
-#include <opensm/osm_madw.h>
-#include <opensm/osm_sa_response.h>
-#include <opensm/osm_subnet.h>
-#include <opensm/osm_port.h>
-#include <opensm/osm_log.h>
-#include <opensm/osm_state_mgr.h>
-
-#ifdef __cplusplus
-#  define BEGIN_C_DECLS extern "C" {
-#  define END_C_DECLS   }
-#else				/* !__cplusplus */
-#  define BEGIN_C_DECLS
-#  define END_C_DECLS
-#endif				/* __cplusplus */
-
-BEGIN_C_DECLS
-/****h* OpenSM/MultiPath Record Receiver
-* NAME
-*	MultiPath Record Receiver
-*
-* DESCRIPTION
-*	The MultiPath Record Receiver object encapsulates the information
-*	needed to receive the PathRecord request from a node.
-*
-*	The MultiPath Record Receiver object is thread safe.
-*
-*	This object should be treated as opaque and should be
-*	manipulated only through the provided functions.
-*
-* AUTHOR
-*	Hal Rosenstock, Voltaire
-*
-*********/
-/****s* OpenSM: MultiPath Record Receiver/osm_mpr_rcv_t
-* NAME
-*	osm_mpr_rcv_t
-*
-* DESCRIPTION
-*	MultiPath Record Receiver structure.
-*
-*	This object should be treated as opaque and should
-*	be manipulated only through the provided functions.
-*
-* SYNOPSIS
-*/
-typedef struct _osm_mpr_rcv {
-	osm_subn_t *p_subn;
-	osm_sa_resp_t *p_resp;
-	osm_mad_pool_t *p_mad_pool;
-	osm_log_t *p_log;
-	cl_plock_t *p_lock;
-} osm_mpr_rcv_t;
-/*
-* FIELDS
-*	p_subn
-*		Pointer to the Subnet object for this subnet.
-*
-*	p_gen_req_ctrl
-*		Pointer to the generic request controller.
-*
-*	p_log
-*		Pointer to the log object.
-*
-*	p_lock
-*		Pointer to the serializing lock.
-*
-* SEE ALSO
-*	MultiPath Record Receiver object
-*********/
-
-/****f* OpenSM: MultiPath Record Receiver/osm_mpr_rcv_construct
-* NAME
-*	osm_mpr_rcv_construct
-*
-* DESCRIPTION
-*	This function constructs a MultiPath Record Receiver object.
-*
-* SYNOPSIS
-*/
-void osm_mpr_rcv_construct(IN osm_mpr_rcv_t * const p_rcv);
-/*
-* PARAMETERS
-*	p_rcv
-*		[in] Pointer to a MultiPath Record Receiver object to construct.
-*
-* RETURN VALUE
-*	This function does not return a value.
-*
-* NOTES
-*	Allows calling osm_mpr_rcv_init, osm_mpr_rcv_destroy
-*
-*	Calling osm_mpr_rcv_construct is a prerequisite to calling any other
-*	method except osm_mpr_rcv_init.
-*
-* SEE ALSO
-*	MultiPath Record Receiver object, osm_mpr_rcv_init, osm_mpr_rcv_destroy
-*********/
-
-/****f* OpenSM: MultiPath Record Receiver/osm_mpr_rcv_destroy
-* NAME
-*	osm_mpr_rcv_destroy
-*
-* DESCRIPTION
-*	The osm_mpr_rcv_destroy function destroys the object, releasing
-*	all resources.
-*
-* SYNOPSIS
-*/
-void osm_mpr_rcv_destroy(IN osm_mpr_rcv_t * const p_rcv);
-/*
-* PARAMETERS
-*	p_rcv
-*		[in] Pointer to the object to destroy.
-*
-* RETURN VALUE
-*	This function does not return a value.
-*
-* NOTES
-*	Performs any necessary cleanup of the specified
-*	MultiPath Record Receiver object.
-*	Further operations should not be attempted on the destroyed object.
-*	This function should only be called after a call to
-*	osm_mpr_rcv_construct or osm_mpr_rcv_init.
-*
-* SEE ALSO
-*	MultiPath Record Receiver object, osm_mpr_rcv_construct,
-*	osm_mpr_rcv_init
-*********/
-
-/****f* OpenSM: MultiPath Record Receiver/osm_mpr_rcv_init
-* NAME
-*	osm_mpr_rcv_init
-*
-* DESCRIPTION
-*	The osm_mpr_rcv_init function initializes a
-*	MultiPath Record Receiver object for use.
-*
-* SYNOPSIS
-*/
-ib_api_status_t
-osm_mpr_rcv_init(IN osm_mpr_rcv_t * const p_rcv,
-		 IN osm_sa_resp_t * const p_resp,
-		 IN osm_mad_pool_t * const p_mad_pool,
-		 IN osm_subn_t * const p_subn,
-		 IN osm_log_t * const p_log, IN cl_plock_t * const p_lock);
-/*
-* PARAMETERS
-*	p_rcv
-*		[in] Pointer to an osm_mpr_rcv_t object to initialize.
-*
-*	p_subn
-*		[in] Pointer to the Subnet object for this subnet.
-*
-*	p_log
-*		[in] Pointer to the log object.
-*
-*	p_lock
-*		[in] Pointer to the OpenSM serializing lock.
-*
-* RETURN VALUES
-*	IB_SUCCESS if the MultiPath Record Receiver object was initialized
-*	successfully.
-*
-* NOTES
-*	Allows calling other MultiPath Record Receiver methods.
-*
-* SEE ALSO
-*	MultiPath Record Receiver object, osm_mpr_rcv_construct,
-*	osm_mpr_rcv_destroy
-*********/
-
-/****f* OpenSM: MultiPath Record Receiver/osm_mpr_rcv_process
-* NAME
-*	osm_mpr_rcv_process
-*
-* DESCRIPTION
-*	Process the MultiPathRecord request.
-*
-* SYNOPSIS
-*/
-void osm_mpr_rcv_process(IN void *context, IN void *data);
-/*
-* PARAMETERS
-*	context
-*		[in] Pointer to an osm_mpr_rcv_t object.
-*
-*	data
-*		[in] Pointer to the MAD Wrapper containing the MAD
-*		that contains the node's MultiPathRecord attribute.
-*
-* RETURN VALUES
-*	IB_SUCCESS if the MultiPathRecord processing was successful.
-*
-* NOTES
-*	This function processes a MultiPathRecord attribute.
-*
-* SEE ALSO
-*	MultiPath Record Receiver, Node Info Response Controller
-*********/
-
-END_C_DECLS
-#endif				/* _OSM_MPR_RCV_H_ */
diff --git a/opensm/include/opensm/osm_sa_node_record.h b/opensm/include/opensm/osm_sa_node_record.h
deleted file mode 100644
index 8f385f8..0000000
--- a/opensm/include/opensm/osm_sa_node_record.h
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Copyright (c) 2004-2007 Voltaire, Inc. All rights reserved.
- * Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
- * Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
- *
- * This software is available to you under a choice of one of two
- * licenses.  You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
- *
- *     Redistribution and use in source and binary forms, with or
- *     without modification, are permitted provided that the following
- *     conditions are met:
- *
- *      - Redistributions of source code must retain the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-/*
- * Abstract:
- * 	Declaration of osm_nr_rcv_t.
- *	This object represents the NodeRecord Receiver object.
- *	attribute from a node.
- *	This object is part of the OpenSM family of objects.
- *
- * Environment:
- * 	Linux User Mode
- *
- * $Revision: 1.4 $
- */
-
-#ifndef _OSM_NR_H_
-#define _OSM_NR_H_
-
-#include <complib/cl_passivelock.h>
-#include <opensm/osm_base.h>
-#include <opensm/osm_madw.h>
-#include <opensm/osm_sa_response.h>
-#include <opensm/osm_subnet.h>
-#include <opensm/osm_log.h>
-
-#ifdef __cplusplus
-#  define BEGIN_C_DECLS extern "C" {
-#  define END_C_DECLS   }
-#else				/* !__cplusplus */
-#  define BEGIN_C_DECLS
-#  define END_C_DECLS
-#endif				/* __cplusplus */
-
-BEGIN_C_DECLS
-/****h* OpenSM/Node Record Receiver
-* NAME
-*	Node Record Receiver
-*
-* DESCRIPTION
-*	The Node Record Receiver object encapsulates the information
-*	needed to receive the NodeRecord attribute from a node.
-*
-*	The Node record Receiver object is thread safe.
-*
-*	This object should be treated as opaque and should be
-*	manipulated only through the provided functions.
-*
-* AUTHOR
-*	Anil S Keshavamurthy, Intel
-*
-*********/
-/****s* OpenSM: Node Record Receiver/osm_nr_rcv_t
-* NAME
-*	osm_nr_rcv_t
-*
-* DESCRIPTION
-*	Node Record Receiver structure.
-*
-*	This object should be treated as opaque and should
-*	be manipulated only through the provided functions.
-*
-* SYNOPSIS
-*/
-typedef struct _osm_nr_recv {
-	osm_subn_t *p_subn;
-	osm_sa_resp_t *p_resp;
-	osm_mad_pool_t *p_mad_pool;
-	osm_log_t *p_log;
-	cl_plock_t *p_lock;
-} osm_nr_rcv_t;
-/*
-* FIELDS
-*	p_subn
-*		Pointer to the Subnet object for this subnet.
-*
-*	p_resp
-*		Pointer to the SA responder.
-*
-*	p_mad_pool
-*		Pointer to the mad pool.
-*
-*	p_log
-*		Pointer to the log object.
-*
-*	p_lock
-*		Pointer to the serializing lock.
-*
-* SEE ALSO
-*
-*********/
-
-/****f* OpenSM: Node Record Receiver/osm_nr_rcv_construct
-* NAME
-*	osm_nr_rcv_construct
-*
-* DESCRIPTION
-*	This function constructs a Node Record Receiver object.
-*
-* SYNOPSIS
-*/
-void osm_nr_rcv_construct(IN osm_nr_rcv_t * const p_rcv);
-/*
-* PARAMETERS
-*	p_rcv
-*		[in] Pointer to a Node Record Receiver object to construct.
-*
-* RETURN VALUE
-*	This function does not return a value.
-*
-* NOTES
-*	Allows calling osm_nr_rcv_init, osm_nr_rcv_destroy
-*
-*	Calling osm_nr_rcv_construct is a prerequisite to calling any other
-*	method except osm_nr_rcv_init.
-*
-* SEE ALSO
-*	Node Record Receiver object, osm_nr_rcv_init, osm_lr_rcv_destroy
-*********/
-
-/****f* OpenSM: Node Record Receiver/osm_nr_rcv_destroy
-* NAME
-*	osm_nr_rcv_destroy
-*
-* DESCRIPTION
-*	The osm_nr_rcv_destroy function destroys the object, releasing
-*	all resources.
-*
-* SYNOPSIS
-*/
-void osm_nr_rcv_destroy(IN osm_nr_rcv_t * const p_rcv);
-/*
-* PARAMETERS
-*	p_rcv
-*		[in] Pointer to the object to destroy.
-*
-* RETURN VALUE
-*	This function does not return a value.
-*
-* NOTES
-*	Performs any necessary cleanup of the specified
-*	Node Record Receiver object.
-*	Further operations should not be attempted on the destroyed object.
-*	This function should only be called after a call to
-*	osm_nr_rcv_construct or osm_nr_rcv_init.
-*
-* SEE ALSO
-*	Node Record Receiver object, osm_nr_rcv_construct,
-*	osm_nr_rcv_init
-*********/
-
-/****f* OpenSM: Node Record Receiver/osm_nr_rcv_init
-* NAME
-*	osm_nr_rcv_init
-*
-* DESCRIPTION
-*	The osm_nr_rcv_init function initializes a
-*	Node Record Receiver object for use.
-*
-* SYNOPSIS
-*/
-ib_api_status_t osm_nr_rcv_init(IN osm_nr_rcv_t * const p_rcv,
-				IN osm_sa_resp_t * const p_resp,
-				IN osm_mad_pool_t * const p_mad_pool,
-				IN osm_subn_t * const p_subn,
-				IN osm_log_t * const p_log,
-				IN cl_plock_t * const p_lock);
-/*
-* PARAMETERS
-*	p_rcv
-*		[in] Pointer to an osm_nr_rcv_t object to initialize.
-*
-*	p_resp
-*		[in] Pointer to the SA Responder object.
-*
-*	p_mad_pool
-*		[in] Pointer to the mad pool.
-*
-*	p_subn
-*		[in] Pointer to the Subnet object for this subnet.
-*
-*	p_log
-*		[in] Pointer to the log object.
-*
-*	p_lock
-*		[in] Pointer to the OpenSM serializing lock.
-*
-* RETURN VALUES
-*	IB_SUCCESS if the Node Record Receiver object was initialized
-*	successfully.
-*
-* NOTES
-*	Allows calling other Link Record Receiver methods.
-*
-* SEE ALSO
-*	Node Record Receiver object, osm_nr_rcv_construct, osm_nr_rcv_destroy
-*********/
-
-/****f* OpenSM: Node Record Receiver/osm_nr_rcv_process
-* NAME
-*	osm_nr_rcv_process
-*
-* DESCRIPTION
-*	Process the NodeRecord attribute.
-*
-* SYNOPSIS
-*/
-void osm_nr_rcv_process(IN void *context, IN void *data);
-/*
-* PARAMETERS
-*	context
-*		[in] Pointer to an osm_nr_rcv_t object.
-*
-*	data
-*		[in] Pointer to the MAD Wrapper containing the MAD
-*		that contains the node's NodeRecord attribute.
-*
-* NOTES
-*	This function processes a NodeRecord attribute.
-*
-* SEE ALSO
-*	Node Record Receiver, Node Record Response Controller
-*********/
-
-END_C_DECLS
-#endif				/* _OSM_NR_H_ */
diff --git a/opensm/include/opensm/osm_sa_path_record.h b/opensm/include/opensm/osm_sa_path_record.h
deleted file mode 100644
index 76d24fc..0000000
--- a/opensm/include/opensm/osm_sa_path_record.h
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * Copyright (c) 2004-2007 Voltaire, Inc. All rights reserved.
- * Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
- * Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
- *
- * This software is available to you under a choice of one of two
- * licenses.  You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
- *
- *     Redistribution and use in source and binary forms, with or
- *     without modification, are permitted provided that the following
- *     conditions are met:
- *
- *      - Redistributions of source code must retain the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-/*
- * Abstract:
- * 	Declaration of osm_pr_rcv_t.
- *	This object represents the PathRecord Receiver object.
- *	attribute from a node.
- *	This object is part of the OpenSM family of objects.
- *
- * Environment:
- * 	Linux User Mode
- *
- * $Revision: 1.4 $
- */
-
-#ifndef _OSM_PR_H_
-#define _OSM_PR_H_
-
-#include <complib/cl_passivelock.h>
-#include <opensm/osm_base.h>
-#include <opensm/osm_madw.h>
-#include <opensm/osm_sa_response.h>
-#include <opensm/osm_subnet.h>
-#include <opensm/osm_port.h>
-#include <opensm/osm_log.h>
-
-#ifdef __cplusplus
-#  define BEGIN_C_DECLS extern "C" {
-#  define END_C_DECLS   }
-#else				/* !__cplusplus */
-#  define BEGIN_C_DECLS
-#  define END_C_DECLS
-#endif				/* __cplusplus */
-
-BEGIN_C_DECLS
-/****h* OpenSM/Path Record Receiver
-* NAME
-*	Path Record Receiver
-*
-* DESCRIPTION
-*	The Path Record Receiver object encapsulates the information
-*	needed to receive the PathRecord request from a node.
-*
-*	The Path Record Receiver object is thread safe.
-*
-*	This object should be treated as opaque and should be
-*	manipulated only through the provided functions.
-*
-* AUTHOR
-*	Ranjit Pandit, Intel
-*	Steve King, Intel
-*
-*********/
-/****s* OpenSM: Path Record Receiver/osm_pr_rcv_t
-* NAME
-*	osm_pr_rcv_t
-*
-* DESCRIPTION
-*	Path Record Receiver structure.
-*
-*	This object should be treated as opaque and should
-*	be manipulated only through the provided functions.
-*
-* SYNOPSIS
-*/
-typedef struct _osm_pr_rcv {
-	osm_subn_t *p_subn;
-	osm_sa_resp_t *p_resp;
-	osm_mad_pool_t *p_mad_pool;
-	osm_log_t *p_log;
-	cl_plock_t *p_lock;
-} osm_pr_rcv_t;
-/*
-* FIELDS
-*	p_subn
-*		Pointer to the Subnet object for this subnet.
-*
-*	p_gen_req_ctrl
-*		Pointer to the generic request controller.
-*
-*	p_log
-*		Pointer to the log object.
-*
-*	p_lock
-*		Pointer to the serializing lock.
-*
-* SEE ALSO
-*	Path Record Receiver object
-*********/
-
-/****f* OpenSM: Path Record Receiver/osm_pr_rcv_construct
-* NAME
-*	osm_pr_rcv_construct
-*
-* DESCRIPTION
-*	This function constructs a Path Record Receiver object.
-*
-* SYNOPSIS
-*/
-void osm_pr_rcv_construct(IN osm_pr_rcv_t * const p_rcv);
-/*
-* PARAMETERS
-*	p_rcv
-*		[in] Pointer to a Path Record Receiver object to construct.
-*
-* RETURN VALUE
-*	This function does not return a value.
-*
-* NOTES
-*	Allows calling osm_pr_rcv_init, osm_pr_rcv_destroy
-*
-*	Calling osm_pr_rcv_construct is a prerequisite to calling any other
-*	method except osm_pr_rcv_init.
-*
-* SEE ALSO
-*	Path Record Receiver object, osm_pr_rcv_init, osm_pr_rcv_destroy
-*********/
-
-/****f* OpenSM: Path Record Receiver/osm_pr_rcv_destroy
-* NAME
-*	osm_pr_rcv_destroy
-*
-* DESCRIPTION
-*	The osm_pr_rcv_destroy function destroys the object, releasing
-*	all resources.
-*
-* SYNOPSIS
-*/
-void osm_pr_rcv_destroy(IN osm_pr_rcv_t * const p_rcv);
-/*
-* PARAMETERS
-*	p_rcv
-*		[in] Pointer to the object to destroy.
-*
-* RETURN VALUE
-*	This function does not return a value.
-*
-* NOTES
-*	Performs any necessary cleanup of the specified
-*	Path Record Receiver object.
-*	Further operations should not be attempted on the destroyed object.
-*	This function should only be called after a call to
-*	osm_pr_rcv_construct or osm_pr_rcv_init.
-*
-* SEE ALSO
-*	Path Record Receiver object, osm_pr_rcv_construct,
-*	osm_pr_rcv_init
-*********/
-
-/****f* OpenSM: Path Record Receiver/osm_pr_rcv_init
-* NAME
-*	osm_pr_rcv_init
-*
-* DESCRIPTION
-*	The osm_pr_rcv_init function initializes a
-*	Path Record Receiver object for use.
-*
-* SYNOPSIS
-*/
-ib_api_status_t
-osm_pr_rcv_init(IN osm_pr_rcv_t * const p_rcv,
-		IN osm_sa_resp_t * const p_resp,
-		IN osm_mad_pool_t * const p_mad_pool,
-		IN osm_subn_t * const p_subn,
-		IN osm_log_t * const p_log, IN cl_plock_t * const p_lock);
-/*
-* PARAMETERS
-*	p_rcv
-*		[in] Pointer to an osm_pr_rcv_t object to initialize.
-*
-*	p_subn
-*		[in] Pointer to the Subnet object for this subnet.
-*
-*	p_log
-*		[in] Pointer to the log object.
-*
-*	p_lock
-*		[in] Pointer to the OpenSM serializing lock.
-*
-* RETURN VALUES
-*	IB_SUCCESS if the Path Record Receiver object was initialized
-*	successfully.
-*
-* NOTES
-*	Allows calling other Path Record Receiver methods.
-*
-* SEE ALSO
-*	Path Record Receiver object, osm_pr_rcv_construct,
-*	osm_pr_rcv_destroy
-*********/
-
-/****f* OpenSM: Path Record Receiver/osm_pr_rcv_process
-* NAME
-*	osm_pr_rcv_process
-*
-* DESCRIPTION
-*	Process the PathRecord request.
-*
-* SYNOPSIS
-*/
-void osm_pr_rcv_process(IN void *context, IN void *data);
-/*
-* PARAMETERS
-*	context
-*		[in] Pointer to an osm_pr_rcv_t object.
-*
-*	data
-*		[in] Pointer to the MAD Wrapper containing the MAD
-*		that contains the node's PathRecord attribute.
-*
-* RETURN VALUES
-*	IB_SUCCESS if the PathRecord processing was successful.
-*
-* NOTES
-*	This function processes a PathRecord attribute.
-*
-* SEE ALSO
-*	Path Record Receiver, Path Record Response Controller
-*********/
-
-END_C_DECLS
-#endif				/* _OSM_PR_H_ */
diff --git a/opensm/include/opensm/osm_sa_pkey_record.h b/opensm/include/opensm/osm_sa_pkey_record.h
deleted file mode 100644
index b2f43f0..0000000
--- a/opensm/include/opensm/osm_sa_pkey_record.h
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * Copyright (c) 2004-2007 Voltaire, Inc. All rights reserved.
- * Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
- * Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
- *
- * This software is available to you under a choice of one of two
- * licenses.  You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
- *
- *     Redistribution and use in source and binary forms, with or
- *     without modification, are permitted provided that the following
- *     conditions are met:
- *
- *      - Redistributions of source code must retain the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-#ifndef _OSM_PKEY_REC_RCV_H_
-#define _OSM_PKEY_REC_RCV_H_
-
-#include <complib/cl_passivelock.h>
-#include <opensm/osm_base.h>
-#include <opensm/osm_madw.h>
-#include <opensm/osm_sa_response.h>
-#include <opensm/osm_subnet.h>
-#include <opensm/osm_port.h>
-#include <opensm/osm_log.h>
-
-#ifdef __cplusplus
-#  define BEGIN_C_DECLS extern "C" {
-#  define END_C_DECLS   }
-#else				/* !__cplusplus */
-#  define BEGIN_C_DECLS
-#  define END_C_DECLS
-#endif				/* __cplusplus */
-
-BEGIN_C_DECLS
-/****h* OpenSM/P_Key Record Receiver
-* NAME
-*  P_Key Record Receiver
-*
-* DESCRIPTION
-*  The P_Key Record Receiver object encapsulates the information
-*  needed to handle P_Key Record query from a SA.
-*
-*  The P_Key Record Receiver object is thread safe.
-*
-*  This object should be treated as opaque and should be
-*  manipulated only through the provided functions.
-*
-* AUTHOR
-*  Yael Kalka, Mellanox
-*
-*********/
-/****s* OpenSM: P_Key Record Receiver/osm_pkey_rec_rcv_t
-* NAME
-*  osm_pkey_rec_rcv_t
-*
-* DESCRIPTION
-*  P_Key Record Receiver structure.
-*
-*  This object should be treated as opaque and should
-*  be manipulated only through the provided functions.
-*
-* SYNOPSIS
-*/
-typedef struct _osm_pkey_rec_rcv {
-	osm_subn_t *p_subn;
-	osm_sa_resp_t *p_resp;
-	osm_mad_pool_t *p_mad_pool;
-	osm_log_t *p_log;
-	cl_plock_t *p_lock;
-} osm_pkey_rec_rcv_t;
-/*
-* FIELDS
-*  p_subn
-*     Pointer to the Subnet object for this subnet.
-*
-*  p_resp
-*     Pointer to the SA responder.
-*
-*  p_mad_pool
-*     Pointer to the mad pool.
-*
-*  p_log
-*     Pointer to the log object.
-*
-*  p_lock
-*     Pointer to the serializing lock.
-*
-* SEE ALSO
-*
-*********/
-
-/****f* OpenSM: P_Key Record Receiver/osm_vlarb_rec_rcv_construct
-* NAME
-*  osm_pkey_rec_rcv_construct
-*
-* DESCRIPTION
-*  This function constructs a P_Key Record Receiver object.
-*
-* SYNOPSIS
-*/
-void osm_pkey_rec_rcv_construct(IN osm_pkey_rec_rcv_t * const p_rcv);
-/*
-* PARAMETERS
-*  p_rcv
-*     [in] Pointer to a P_Key Record Receiver object to construct.
-*
-* RETURN VALUE
-*  This function does not return a value.
-*
-* NOTES
-*  Allows calling osm_pkey_rec_rcv_init, osm_pkey_rec_rcv_destroy
-*
-*  Calling osm_pkey_rec_rcv_construct is a prerequisite to calling any other
-*  method except osm_pkey_rec_rcv_init.
-*
-* SEE ALSO
-*  P_Key Record Receiver object, osm_pkey_rec_rcv_init,
-*  osm_pkey_rec_rcv_destroy
-*********/
-
-/****f* OpenSM: P_Key Record Receiver/osm_pkey_rec_rcv_destroy
-* NAME
-*  osm_pkey_rec_rcv_destroy
-*
-* DESCRIPTION
-*  The osm_pkey_rec_rcv_destroy function destroys the object, releasing
-*  all resources.
-*
-* SYNOPSIS
-*/
-void osm_pkey_rec_rcv_destroy(IN osm_pkey_rec_rcv_t * const p_rcv);
-/*
-* PARAMETERS
-*  p_rcv
-*     [in] Pointer to the object to destroy.
-*
-* RETURN VALUE
-*  This function does not return a value.
-*
-* NOTES
-*  Performs any necessary cleanup of the specified
-*  P_Key Record Receiver object.
-*  Further operations should not be attempted on the destroyed object.
-*  This function should only be called after a call to
-*  osm_pkey_rec_rcv_construct or osm_pkey_rec_rcv_init.
-*
-* SEE ALSO
-*  P_Key Record Receiver object, osm_pkey_rec_rcv_construct,
-*  osm_pkey_rec_rcv_init
-*********/
-
-/****f* OpenSM: P_Key Record Receiver/osm_pkey_rec_rcv_init
-* NAME
-*  osm_pkey_rec_rcv_init
-*
-* DESCRIPTION
-*  The osm_pkey_rec_rcv_init function initializes a
-*  P_Key Record Receiver object for use.
-*
-* SYNOPSIS
-*/
-ib_api_status_t
-osm_pkey_rec_rcv_init(IN osm_pkey_rec_rcv_t * const p_rcv,
-		      IN osm_sa_resp_t * const p_resp,
-		      IN osm_mad_pool_t * const p_mad_pool,
-		      IN osm_subn_t * const p_subn,
-		      IN osm_log_t * const p_log, IN cl_plock_t * const p_lock);
-/*
-* PARAMETERS
-*  p_rcv
-*     [in] Pointer to an osm_pkey_rec_rcv_t object to initialize.
-*
-*  p_req
-*     [in] Pointer to an osm_req_t object.
-*
-*  p_subn
-*     [in] Pointer to the Subnet object for this subnet.
-*
-*  p_log
-*     [in] Pointer to the log object.
-*
-*  p_lock
-*     [in] Pointer to the OpenSM serializing lock.
-*
-* RETURN VALUES
-*  CL_SUCCESS if the P_Key Record Receiver object was initialized
-*  successfully.
-*
-* NOTES
-*  Allows calling other P_Key Record Receiver methods.
-*
-* SEE ALSO
-*  P_Key Record Receiver object, osm_pkey_rec_rcv_construct,
-*  osm_pkey_rec_rcv_destroy
-*********/
-
-/****f* OpenSM: P_Key Record Receiver/osm_pkey_rec_rcv_process
-* NAME
-*  osm_pkey_rec_rcv_process
-*
-* DESCRIPTION
-*  Process the P_Key Table Query .
-*
-* SYNOPSIS
-*/
-void osm_pkey_rec_rcv_process(IN void *context, IN void *data);
-/*
-* PARAMETERS
-*  context
-*     [in] Pointer to an osm_pkey_rec_rcv_t object.
-*
-*  data
-*     [in] Pointer to the MAD Wrapper containing the MAD
-*     that contains the P_Key Record Query attribute.
-*
-* RETURN VALUES
-*  CL_SUCCESS if the Query processing was successful.
-*
-* NOTES
-*  This function processes a SA P_Key Record attribute.
-*
-* SEE ALSO
-*  P_Key Record Receiver, P_Key Record Response Controller
-*********/
-
-END_C_DECLS
-#endif				/* _OSM_PKEY_REC_RCV_H_ */
diff --git a/opensm/include/opensm/osm_sa_portinfo_record.h b/opensm/include/opensm/osm_sa_portinfo_record.h
deleted file mode 100644
index a818f25..0000000
--- a/opensm/include/opensm/osm_sa_portinfo_record.h
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * Copyright (c) 2004-2007 Voltaire, Inc. All rights reserved.
- * Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
- * Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
- *
- * This software is available to you under a choice of one of two
- * licenses.  You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
- *
- *     Redistribution and use in source and binary forms, with or
- *     without modification, are permitted provided that the following
- *     conditions are met:
- *
- *      - Redistributions of source code must retain the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-/*
- * Abstract:
- * 	Declaration of osm_pir_rcv_t.
- *	This object represents the PortInfo Record Receiver object.
- *	attribute from a node.
- *	This object is part of the OpenSM family of objects.
- *
- * Environment:
- * 	Linux User Mode
- *
- * $Revision: 1.4 $
- */
-
-#ifndef _OSM_PIR_RCV_H_
-#define _OSM_PIR_RCV_H_
-
-#include <complib/cl_passivelock.h>
-#include <opensm/osm_base.h>
-#include <opensm/osm_madw.h>
-#include <opensm/osm_sa_response.h>
-#include <opensm/osm_subnet.h>
-#include <opensm/osm_port.h>
-#include <opensm/osm_log.h>
-
-#ifdef __cplusplus
-#  define BEGIN_C_DECLS extern "C" {
-#  define END_C_DECLS   }
-#else				/* !__cplusplus */
-#  define BEGIN_C_DECLS
-#  define END_C_DECLS
-#endif				/* __cplusplus */
-
-BEGIN_C_DECLS
-/****h* OpenSM/PortInfo Record Receiver
-* NAME
-*	PortInfo Record Receiver
-*
-* DESCRIPTION
-*	The PortInfo Record Receiver object encapsulates the information
-*	needed to receive the PortInfoRecord attribute from a node.
-*
-*	The PortInfo Record Receiver object is thread safe.
-*
-*	This object should be treated as opaque and should be
-*	manipulated only through the provided functions.
-*
-* AUTHOR
-*	Ranjit Pandit, Intel
-*
-*********/
-/****s* OpenSM: PortInfo Record Receiver/osm_pir_rcv_t
-* NAME
-*	osm_pir_rcv_t
-*
-* DESCRIPTION
-*	PortInfo Record Receiver structure.
-*
-*	This object should be treated as opaque and should
-*	be manipulated only through the provided functions.
-*
-* SYNOPSIS
-*/
-typedef struct _osm_pir_rcv {
-	osm_subn_t *p_subn;
-	osm_sa_resp_t *p_resp;
-	osm_mad_pool_t *p_mad_pool;
-	osm_log_t *p_log;
-	cl_plock_t *p_lock;
-} osm_pir_rcv_t;
-/*
-* FIELDS
-*	p_subn
-*		Pointer to the Subnet object for this subnet.
-*
-*	p_resp
-*		Pointer to the SA responder.
-*
-*	p_mad_pool
-*		Pointer to the mad pool.
-*
-*	p_log
-*		Pointer to the log object.
-*
-*	p_lock
-*		Pointer to the serializing lock.
-*
-* SEE ALSO
-*
-*********/
-
-/****f* OpenSM: PortInfo Record Receiver/osm_pir_rcv_construct
-* NAME
-*	osm_pir_rcv_construct
-*
-* DESCRIPTION
-*	This function constructs a PortInfo Record Receiver object.
-*
-* SYNOPSIS
-*/
-void osm_pir_rcv_construct(IN osm_pir_rcv_t * const p_rcv);
-/*
-* PARAMETERS
-*	p_rcv
-*		[in] Pointer to a PortInfo Record Receiver object to construct.
-*
-* RETURN VALUE
-*	This function does not return a value.
-*
-* NOTES
-*	Allows calling osm_pir_rcv_init, osm_pir_rcv_destroy
-*
-*	Calling osm_pir_rcv_construct is a prerequisite to calling any other
-*	method except osm_pir_rcv_init.
-*
-* SEE ALSO
-*	PortInfo Record Receiver object, osm_pir_rcv_init,
-*	osm_pir_rcv_destroy
-*********/
-
-/****f* OpenSM: PortInfo Record Receiver/osm_pir_rcv_destroy
-* NAME
-*	osm_pir_rcv_destroy
-*
-* DESCRIPTION
-*	The osm_pir_rcv_destroy function destroys the object, releasing
-*	all resources.
-*
-* SYNOPSIS
-*/
-void osm_pir_rcv_destroy(IN osm_pir_rcv_t * const p_rcv);
-/*
-* PARAMETERS
-*	p_rcv
-*		[in] Pointer to the object to destroy.
-*
-* RETURN VALUE
-*	This function does not return a value.
-*
-* NOTES
-*	Performs any necessary cleanup of the specified
-*	PortInfo Record Receiver object.
-*	Further operations should not be attempted on the destroyed object.
-*	This function should only be called after a call to
-*	osm_pir_rcv_construct or osm_pir_rcv_init.
-*
-* SEE ALSO
-*	PortInfo Record Receiver object, osm_pir_rcv_construct,
-*	osm_pir_rcv_init
-*********/
-
-/****f* OpenSM: PortInfo Record Receiver/osm_pir_rcv_init
-* NAME
-*	osm_pir_rcv_init
-*
-* DESCRIPTION
-*	The osm_pir_rcv_init function initializes a
-*	PortInfo Record Receiver object for use.
-*
-* SYNOPSIS
-*/
-ib_api_status_t
-osm_pir_rcv_init(IN osm_pir_rcv_t * const p_rcv,
-		 IN osm_sa_resp_t * const p_resp,
-		 IN osm_mad_pool_t * const p_mad_pool,
-		 IN osm_subn_t * const p_subn,
-		 IN osm_log_t * const p_log, IN cl_plock_t * const p_lock);
-/*
-* PARAMETERS
-*	p_rcv
-*		[in] Pointer to an osm_pir_rcv_t object to initialize.
-*
-*	p_req
-*		[in] Pointer to an osm_req_t object.
-*
-*	p_subn
-*		[in] Pointer to the Subnet object for this subnet.
-*
-*	p_log
-*		[in] Pointer to the log object.
-*
-*	p_lock
-*		[in] Pointer to the OpenSM serializing lock.
-*
-* RETURN VALUES
-*	CL_SUCCESS if the PortInfo Record Receiver object was initialized
-*	successfully.
-*
-* NOTES
-*	Allows calling other PortInfo Record Receiver methods.
-*
-* SEE ALSO
-*	PortInfo Record Receiver object, osm_pir_rcv_construct,
-*	osm_pir_rcv_destroy
-*********/
-
-/****f* OpenSM: PortInfo Record Receiver/osm_pir_rcv_process
-* NAME
-*	osm_pir_rcv_process
-*
-* DESCRIPTION
-*	Process the PortInfoRecord attribute.
-*
-* SYNOPSIS
-*/
-void osm_pir_rcv_process(IN void *context, IN void *data);
-/*
-* PARAMETERS
-*	context
-*		[in] Pointer to an osm_pir_rcv_t object.
-*
-*	data
-*		[in] Pointer to the MAD Wrapper containing the MAD
-*		that contains the node's PortInfoRecord attribute.
-*
-* RETURN VALUES
-*	CL_SUCCESS if the PortInfoRecord processing was successful.
-*
-* NOTES
-*	This function processes a PortInfoRecord attribute.
-*
-* SEE ALSO
-*	PortInfo Record Receiver, PortInfo Record Response Controller
-*********/
-
-END_C_DECLS
-#endif				/* _OSM_PIR_RCV_H_ */
diff --git a/opensm/include/opensm/osm_sa_response.h b/opensm/include/opensm/osm_sa_response.h
deleted file mode 100644
index 53c4f95..0000000
--- a/opensm/include/opensm/osm_sa_response.h
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
- * Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
- * Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
- *
- * This software is available to you under a choice of one of two
- * licenses.  You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
- *
- *     Redistribution and use in source and binary forms, with or
- *     without modification, are permitted provided that the following
- *     conditions are met:
- *
- *      - Redistributions of source code must retain the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-/*
- * Abstract:
- * 	Declaration of osm_sa_resp_t.
- *	This object represents an object that responds to SA queries.
- *	This object is part of the OpenSM family of objects.
- *
- * Environment:
- * 	Linux User Mode
- *
- * $Revision: 1.4 $
- */
-
-#ifndef _OSM_SA_RESP_H_
-#define _OSM_SA_RESP_H_
-
-#include <opensm/osm_base.h>
-#include <opensm/osm_log.h>
-#include <opensm/osm_madw.h>
-#include <opensm/osm_mad_pool.h>
-#include <opensm/osm_subnet.h>
-
-#ifdef __cplusplus
-#  define BEGIN_C_DECLS extern "C" {
-#  define END_C_DECLS   }
-#else				/* !__cplusplus */
-#  define BEGIN_C_DECLS
-#  define END_C_DECLS
-#endif				/* __cplusplus */
-
-BEGIN_C_DECLS
-/****h* OpenSM/SA Response
-* NAME
-*	SA Response
-*
-* DESCRIPTION
-*	The SA Response object encapsulates the information
-*	needed to respond to an SA query.
-*
-*	The SA Response object is thread safe.
-*
-*	This object should be treated as opaque and should be
-*	manipulated only through the provided functions.
-*
-* AUTHOR
-*	Ranjit Pandit, Intel
-*	Steve King, Intel
-*
-*********/
-/****s* OpenSM: SA Response/osm_sa_resp_t
-* NAME
-*	osm_sa_resp_t
-*
-* DESCRIPTION
-*	SA Response structure.
-*
-*	This object should be treated as opaque and should
-*	be manipulated only through the provided functions.
-*
-* SYNOPSIS
-*/
-typedef struct _osm_sa_resp {
-	osm_mad_pool_t *p_pool;
-	osm_subn_t *p_subn;
-	osm_log_t *p_log;
-} osm_sa_resp_t;
-/*
-* FIELDS
-*	p_pool
-*		Pointer to the MAD pool.
-*
-* SEE ALSO
-*	SA Response object
-*********/
-
-/****f* OpenSM: SA Response/osm_sa_resp_construct
-* NAME
-*	osm_sa_resp_construct
-*
-* DESCRIPTION
-*	This function constructs a SA Response object.
-*
-* SYNOPSIS
-*/
-void osm_sa_resp_construct(IN osm_sa_resp_t * const p_resp);
-/*
-* PARAMETERS
-*	p_resp
-*		[in] Pointer to a SA Response object to construct.
-*
-* RETURN VALUE
-*	This function does not return a value.
-*
-* NOTES
-*	Allows calling osm_sa_resp_init, and osm_sa_resp_destroy.
-*
-*	Calling osm_sa_resp_construct is a prerequisite to calling any other
-*	method except osm_sa_resp_init.
-*
-* SEE ALSO
-*	SA Response object, osm_sa_resp_init,
-*	osm_sa_resp_destroy
-*********/
-
-/****f* OpenSM: SA Response/osm_sa_resp_destroy
-* NAME
-*	osm_sa_resp_destroy
-*
-* DESCRIPTION
-*	The osm_sa_resp_destroy function destroys the object, releasing
-*	all resources.
-*
-* SYNOPSIS
-*/
-void osm_sa_resp_destroy(IN osm_sa_resp_t * const p_resp);
-/*
-* PARAMETERS
-*	p_resp
-*		[in] Pointer to the object to destroy.
-*
-* RETURN VALUE
-*	This function does not return a value.
-*
-* NOTES
-*	Performs any necessary cleanup of the specified
-*	SA Response object.
-*	Further operations should not be attempted on the destroyed object.
-*	This function should only be called after a call to
-*	osm_sa_resp_construct or osm_sa_resp_init.
-*
-* SEE ALSO
-*	SA Response object, osm_sa_resp_construct,
-*	osm_sa_resp_init
-*********/
-
-/****f* OpenSM: SA Response/osm_sa_resp_init
-* NAME
-*	osm_sa_resp_init
-*
-* DESCRIPTION
-*	The osm_sa_resp_init function initializes a
-*	SA Response object for use.
-*
-* SYNOPSIS
-*/
-ib_api_status_t
-osm_sa_resp_init(IN osm_sa_resp_t * const p_resp,
-		 IN osm_mad_pool_t * const p_pool,
-		 IN osm_subn_t * const p_subn,
-		 IN osm_log_t * const p_log);
-/*
-* PARAMETERS
-*	p_resp
-*		[in] Pointer to an osm_sa_resp_t object to initialize.
-*
-*	p_mad_pool
-*		[in] Pointer to the MAD pool.
-*
-*	p_subn
-*		[in] Pointer to Subnet object for this subnet.
-*
-*	p_log
-*		[in] Pointer to the log object.
-*
-* RETURN VALUES
-*	IB_SUCCESS if the SA Response object was initialized
-*	successfully.
-*
-* NOTES
-*	Allows calling other SA Response methods.
-*
-* SEE ALSO
-*	SA Response object, osm_sa_resp_construct,
-*	osm_sa_resp_destroy
-*********/
-
-END_C_DECLS
-#endif				/* _OSM_SA_RESP_H_ */
diff --git a/opensm/include/opensm/osm_sa_service_record.h b/opensm/include/opensm/osm_sa_service_record.h
deleted file mode 100644
index 63bcc46..0000000
--- a/opensm/include/opensm/osm_sa_service_record.h
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- * Copyright (c) 2004-2007 Voltaire, Inc. All rights reserved.
- * Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
- * Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
- *
- * This software is available to you under a choice of one of two
- * licenses.  You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
- *
- *     Redistribution and use in source and binary forms, with or
- *     without modification, are permitted provided that the following
- *     conditions are met:
- *
- *      - Redistributions of source code must retain the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-/*
- * Abstract:
- * 	Declaration of osm_sr_rcv_t.
- *	This object represents the ServiceRecord Receiver object.
- *	attribute from a node.
- *	This object is part of the OpenSM family of objects.
- *
- * Environment:
- * 	Linux User Mode
- *
- * $Revision: 1.4 $
- */
-
-#ifndef _OSM_SR_H_
-#define _OSM_SR_H_
-
-#include <complib/cl_passivelock.h>
-#include <opensm/osm_base.h>
-#include <opensm/osm_madw.h>
-#include <opensm/osm_sa_response.h>
-#include <opensm/osm_subnet.h>
-#include <opensm/osm_port.h>
-#include <opensm/osm_log.h>
-
-#ifdef __cplusplus
-#  define BEGIN_C_DECLS extern "C" {
-#  define END_C_DECLS   }
-#else				/* !__cplusplus */
-#  define BEGIN_C_DECLS
-#  define END_C_DECLS
-#endif				/* __cplusplus */
-
-BEGIN_C_DECLS
-/****h* OpenSM/Service Record Receiver
-* NAME
-*	Service Record Receiver
-*
-* DESCRIPTION
-*	The Service Record Receiver object encapsulates the information
-*	needed to receive the ServiceRecord request from a node.
-*
-*	The Service Record Receiver object is thread safe.
-*
-*	This object should be treated as opaque and should be
-*	manipulated only through the provided functions.
-*
-* AUTHOR
-*	Anil S Keshavamurthy
-*
-*********/
-/****s* OpenSM: Service Record Receiver/osm_sr_rcv_t
-* NAME
-*	osm_sr_rcv_t
-*
-* DESCRIPTION
-*	Service Record Receiver structure.
-*
-*	This object should be treated as opaque and should
-*	be manipulated only through the provided functions.
-*
-* SYNOPSIS
-*/
-typedef struct _osm_sr_rcv {
-	osm_subn_t *p_subn;
-	osm_sa_resp_t *p_resp;
-	osm_mad_pool_t *p_mad_pool;
-	osm_log_t *p_log;
-	cl_plock_t *p_lock;
-} osm_sr_rcv_t;
-/*
-* FIELDS
-*	p_subn
-*		Pointer to the Subnet object for this subnet.
-*
-*	p_resp
-*		Pointer to the osm_sa_resp_t object.
-*
-*	p_log
-*		Pointer to the log object.
-*
-*	p_lock
-*		Pointer to the serializing lock.
-*
-* SEE ALSO
-*	Service Record Receiver object
-*********/
-
-/****f* OpenSM: Service Record Receiver/osm_sr_rcv_construct
-* NAME
-*	osm_sr_rcv_construct
-*
-* DESCRIPTION
-*	This function constructs a Service Record Receiver object.
-*
-* SYNOPSIS
-*/
-void osm_sr_rcv_construct(IN osm_sr_rcv_t * const p_rcv);
-/*
-* PARAMETERS
-*	p_rcv
-*		[in] Pointer to a Service Record Receiver object to construct.
-*
-* RETURN VALUE
-*	This function does not return a value.
-*
-* NOTES
-*	Allows calling osm_sr_rcv_init, osm_sr_rcv_destroy
-*
-*	Calling osm_sr_rcv_construct is a prerequisite to calling any other
-*	method except osm_sr_rcv_init.
-*
-* SEE ALSO
-*	Service Record Receiver object, osm_sr_rcv_init, osm_sr_rcv_destroy
-*********/
-
-/****f* OpenSM: Service Record Receiver/osm_sr_rcv_destroy
-* NAME
-*	osm_sr_rcv_destroy
-*
-* DESCRIPTION
-*	The osm_sr_rcv_destroy function destroys the object, releasing
-*	all resources.
-*
-* SYNOPSIS
-*/
-void osm_sr_rcv_destroy(IN osm_sr_rcv_t * const p_rcv);
-/*
-* PARAMETERS
-*	p_rcv
-*		[in] Pointer to the object to destroy.
-*
-* RETURN VALUE
-*	This function does not return a value.
-*
-* NOTES
-*	Performs any necessary cleanup of the specified
-*	Service Record Receiver object.
-*	Further operations should not be attempted on the destroyed object.
-*	This function should only be called after a call to
-*	osm_sr_rcv_construct or osm_sr_rcv_init.
-*
-* SEE ALSO
-*	Service Record Receiver object, osm_sr_rcv_construct,
-*	osm_sr_rcv_init
-*********/
-
-/****f* OpenSM: Service Record Receiver/osm_sr_rcv_init
-* NAME
-*	osm_sr_rcv_init
-*
-* DESCRIPTION
-*	The osm_sr_rcv_init function initializes a
-*	Service Record Receiver object for use.
-*
-* SYNOPSIS
-*/
-ib_api_status_t
-osm_sr_rcv_init(IN osm_sr_rcv_t * const p_rcv,
-		IN osm_sa_resp_t * const p_resp,
-		IN osm_mad_pool_t * const p_mad_pool,
-		IN osm_subn_t * const p_subn,
-		IN osm_log_t * const p_log, IN cl_plock_t * const p_lock);
-/*
-* PARAMETERS
-*	p_rcv
-*		[in] Pointer to an osm_sr_rcv_t object to initialize.
-*
-*	p_subn
-*		[in] Pointer to the Subnet object for this subnet.
-*
-*	p_log
-*		[in] Pointer to the log object.
-*
-*	p_lock
-*		[in] Pointer to the OpenSM serializing lock.
-*
-* RETURN VALUES
-*	IB_SUCCESS if the Service Record Receiver object was initialized
-*	successfully.
-*
-* NOTES
-*	Allows calling other Service Record Receiver methods.
-*
-* SEE ALSO
-*	Service Record Receiver object, osm_sr_rcv_construct,
-*	osm_sr_rcv_destroy
-*********/
-
-/****f* OpenSM: Service Record Receiver/osm_sr_rcv_process
-* NAME
-*	osm_sr_rcv_process
-*
-* DESCRIPTION
-*	Process the ServiceRecord request.
-*
-* SYNOPSIS
-*/
-void osm_sr_rcv_process(IN void *context, IN void *data);
-/*
-* PARAMETERS
-*	context
-*		[in] Pointer to an osm_sr_rcv_t object.
-*
-*	data
-*		[in] Pointer to the MAD Wrapper containing the MAD
-*		that contains the node's ServiceRecord attribute.
-* NOTES
-*	This function processes a ServiceRecord attribute.
-*
-* SEE ALSO
-*	Service Record Receiver
-*********/
-
-/****f* OpenSM: Service Record Receiver/osm_sr_rcv_lease_cb
-* NAME
-*	osm_sr_rcv_lease_cb
-*
-* DESCRIPTION
-*	Timer Callback function which is executed to check the lease period
-*	expiration
-*
-* SYNOPSIS
-*/
-
-void osm_sr_rcv_lease_cb(IN void *context);
-/*
-* PARAMETERS
-*	context
-*		[in] Pointer to osm_sa_db_t object.
-*
-* NOTES
-*	This function processes a ServiceRecord attribute.
-*
-* SEE ALSO
-*	Service Record Receiver
-*********/
-
-END_C_DECLS
-#endif				/* _OSM_SR_H_ */
diff --git a/opensm/include/opensm/osm_sa_slvl_record.h b/opensm/include/opensm/osm_sa_slvl_record.h
deleted file mode 100644
index 518a0f1..0000000
--- a/opensm/include/opensm/osm_sa_slvl_record.h
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * Copyright (c) 2004-2007 Voltaire, Inc. All rights reserved.
- * Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
- * Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
- *
- * This software is available to you under a choice of one of two
- * licenses.  You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
- *
- *     Redistribution and use in source and binary forms, with or
- *     without modification, are permitted provided that the following
- *     conditions are met:
- *
- *      - Redistributions of source code must retain the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-/*
- * Abstract:
- * 	Declaration of osm_slvl_rec_rcv_t.
- *	This object represents the SLtoVL Mapping Table Receiver object.
- *	attribute from a SA query.
- *	This object is part of the OpenSM family of objects.
- *
- * Environment:
- * 	Linux User Mode
- *
- * $Revision: 1.3 $
- */
-
-#ifndef _OSM_SLVL_REC_RCV_H_
-#define _OSM_SLVL_REC_RCV_H_
-
-#include <complib/cl_passivelock.h>
-#include <opensm/osm_base.h>
-#include <opensm/osm_madw.h>
-#include <opensm/osm_sa_response.h>
-#include <opensm/osm_subnet.h>
-#include <opensm/osm_port.h>
-#include <opensm/osm_log.h>
-
-#ifdef __cplusplus
-#  define BEGIN_C_DECLS extern "C" {
-#  define END_C_DECLS   }
-#else				/* !__cplusplus */
-#  define BEGIN_C_DECLS
-#  define END_C_DECLS
-#endif				/* __cplusplus */
-
-BEGIN_C_DECLS
-/****h* OpenSM/SLtoVL Mapping Record Receiver
-* NAME
-*	SLtoVL Mapping Record Receiver
-*
-* DESCRIPTION
-*	The SLtoVL Mapping Record Receiver object encapsulates the information
-*	needed to handle SLtoVL Mapping Record query from a SA.
-*
-*	The SLtoVL Mapping Record Receiver object is thread safe.
-*
-*	This object should be treated as opaque and should be
-*	manipulated only through the provided functions.
-*
-* AUTHOR
-*	Eitan Zahavi, Mellanox
-*
-*********/
-/****s* OpenSM: SLtoVL Mapping Record Receiver/osm_slvl_rec_rcv_t
-* NAME
-*	osm_slvl_rec_rcv_t
-*
-* DESCRIPTION
-*	SLtoVL Mapping Record Receiver structure.
-*
-*	This object should be treated as opaque and should
-*	be manipulated only through the provided functions.
-*
-* SYNOPSIS
-*/
-typedef struct _osm_slvl_rec_rcv {
-	osm_subn_t *p_subn;
-	osm_sa_resp_t *p_resp;
-	osm_mad_pool_t *p_mad_pool;
-	osm_log_t *p_log;
-	cl_plock_t *p_lock;
-} osm_slvl_rec_rcv_t;
-/*
-* FIELDS
-*	p_subn
-*		Pointer to the Subnet object for this subnet.
-*
-*	p_resp
-*		Pointer to the SA responder.
-*
-*	p_mad_pool
-*		Pointer to the mad pool.
-*
-*	p_log
-*		Pointer to the log object.
-*
-*	p_lock
-*		Pointer to the serializing lock.
-*
-* SEE ALSO
-*
-*********/
-
-/****f* OpenSM: SLtoVL Mapping Record Receiver/osm_slvl_rec_rcv_construct
-* NAME
-*	osm_slvl_rec_rcv_construct
-*
-* DESCRIPTION
-*	This function constructs a SLtoVL Mapping Record Receiver object.
-*
-* SYNOPSIS
-*/
-void osm_slvl_rec_rcv_construct(IN osm_slvl_rec_rcv_t * const p_rcv);
-/*
-* PARAMETERS
-*	p_rcv
-*		[in] Pointer to a SLtoVL Mapping Record Receiver object to construct.
-*
-* RETURN VALUE
-*	This function does not return a value.
-*
-* NOTES
-*	Allows calling osm_slvl_rec_rcv_init, osm_slvl_rec_rcv_destroy
-*
-*	Calling osm_slvl_rec_rcv_construct is a prerequisite to calling any other
-*	method except osm_slvl_rec_rcv_init.
-*
-* SEE ALSO
-*	SLtoVL Mapping Record Receiver object, osm_slvl_rec_rcv_init,
-*	osm_slvl_rec_rcv_destroy
-*********/
-
-/****f* OpenSM: SLtoVL Mapping Record Receiver/osm_slvl_rec_rcv_destroy
-* NAME
-*	osm_slvl_rec_rcv_destroy
-*
-* DESCRIPTION
-*	The osm_slvl_rec_rcv_destroy function destroys the object, releasing
-*	all resources.
-*
-* SYNOPSIS
-*/
-void osm_slvl_rec_rcv_destroy(IN osm_slvl_rec_rcv_t * const p_rcv);
-/*
-* PARAMETERS
-*	p_rcv
-*		[in] Pointer to the object to destroy.
-*
-* RETURN VALUE
-*	This function does not return a value.
-*
-* NOTES
-*	Performs any necessary cleanup of the specified
-*	SLtoVL Mapping Record Receiver object.
-*	Further operations should not be attempted on the destroyed object.
-*	This function should only be called after a call to
-*	osm_slvl_rec_rcv_construct or osm_slvl_rec_rcv_init.
-*
-* SEE ALSO
-*	SLtoVL Mapping Record Receiver object, osm_slvl_rec_rcv_construct,
-*	osm_slvl_rec_rcv_init
-*********/
-
-/****f* OpenSM: SLtoVL Mapping Record Receiver/osm_slvl_rec_rcv_init
-* NAME
-*	osm_slvl_rec_rcv_init
-*
-* DESCRIPTION
-*	The osm_slvl_rec_rcv_init function initializes a
-*	SLtoVL Mapping Record Receiver object for use.
-*
-* SYNOPSIS
-*/
-ib_api_status_t
-osm_slvl_rec_rcv_init(IN osm_slvl_rec_rcv_t * const p_rcv,
-		      IN osm_sa_resp_t * const p_resp,
-		      IN osm_mad_pool_t * const p_mad_pool,
-		      IN osm_subn_t * const p_subn,
-		      IN osm_log_t * const p_log, IN cl_plock_t * const p_lock);
-/*
-* PARAMETERS
-*	p_rcv
-*		[in] Pointer to an osm_slvl_rec_rcv_t object to initialize.
-*
-*	p_req
-*		[in] Pointer to an osm_req_t object.
-*
-*	p_subn
-*		[in] Pointer to the Subnet object for this subnet.
-*
-*	p_log
-*		[in] Pointer to the log object.
-*
-*	p_lock
-*		[in] Pointer to the OpenSM serializing lock.
-*
-* RETURN VALUES
-*	CL_SUCCESS if the SLtoVL Mapping Record Receiver object was initialized
-*	successfully.
-*
-* NOTES
-*	Allows calling other SLtoVL Mapping Record Receiver methods.
-*
-* SEE ALSO
-*	SLtoVL Mapping Record Receiver object, osm_slvl_rec_rcv_construct,
-*	osm_slvl_rec_rcv_destroy
-*********/
-
-/****f* OpenSM: SLtoVL Mapping Record Receiver/osm_slvl_rec_rcv_process
-* NAME
-*	osm_slvl_rec_rcv_process
-*
-* DESCRIPTION
-*	Process the SLtoVL Map Table Query .
-*
-* SYNOPSIS
-*/
-void osm_slvl_rec_rcv_process(IN void *context, IN void *data);
-/*
-* PARAMETERS
-*	context
-*		[in] Pointer to an osm_slvl_rec_rcv_t object.
-*
-*	data
-*		[in] Pointer to the MAD Wrapper containing the MAD
-*		that contains the SLtoVL Map Record Query attribute.
-*
-* RETURN VALUES
-*	CL_SUCCESS if the Query processing was successful.
-*
-* NOTES
-*	This function processes a SA SLtoVL Map Record attribute.
-*
-* SEE ALSO
-*	SLtoVL Mapping Record Receiver, SLtoVL Mapping Record Response Controller
-*********/
-
-END_C_DECLS
-#endif				/* _OSM_SLVL_REC_RCV_H_ */
diff --git a/opensm/include/opensm/osm_sa_sminfo_record.h b/opensm/include/opensm/osm_sa_sminfo_record.h
deleted file mode 100644
index f4fd1ff..0000000
--- a/opensm/include/opensm/osm_sa_sminfo_record.h
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * Copyright (c) 2004-2007 Voltaire, Inc. All rights reserved.
- * Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
- * Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
- *
- * This software is available to you under a choice of one of two
- * licenses.  You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
- *
- *     Redistribution and use in source and binary forms, with or
- *     without modification, are permitted provided that the following
- *     conditions are met:
- *
- *      - Redistributions of source code must retain the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-/*
- * Abstract:
- * 	Declaration of osm_smir_rcv_t.
- *	This object represents the SMInfo Receiver object.
- *	attribute from a node.
- *	This object is part of the OpenSM family of objects.
- *
- * Environment:
- * 	Linux User Mode
- *
- * $Revision: 1.4 $
- */
-
-#ifndef _OSM_SMIR_H_
-#define _OSM_SMIR_H_
-
-#include <complib/cl_passivelock.h>
-#include <opensm/osm_base.h>
-#include <opensm/osm_madw.h>
-#include <opensm/osm_sa_response.h>
-#include <opensm/osm_subnet.h>
-#include <opensm/osm_stats.h>
-#include <opensm/osm_log.h>
-
-#ifdef __cplusplus
-#  define BEGIN_C_DECLS extern "C" {
-#  define END_C_DECLS   }
-#else				/* !__cplusplus */
-#  define BEGIN_C_DECLS
-#  define END_C_DECLS
-#endif				/* __cplusplus */
-
-BEGIN_C_DECLS
-/****h* OpenSM/SM Info Receiver
-* NAME
-*	SM Info Receiver
-*
-* DESCRIPTION
-*	The SM Info Receiver object encapsulates the information
-*	needed to receive the SMInfoRecord attribute from a node.
-*
-*	The SM Info Receiver object is thread safe.
-*
-*	This object should be treated as opaque and should be
-*	manipulated only through the provided functions.
-*
-* AUTHOR
-*	Ranjit Pandit, Intel
-*
-*********/
-/****s* OpenSM: SM Info Receiver/osm_smir_rcv_t
-* NAME
-*	osm_smir_rcv_t
-*
-* DESCRIPTION
-*	SM Info Receiver structure.
-*
-*	This object should be treated as opaque and should
-*	be manipulated only through the provided functions.
-*
-* SYNOPSIS
-*/
-typedef struct _osm_smir {
-	osm_subn_t *p_subn;
-	osm_stats_t *p_stats;
-	osm_sa_resp_t *p_resp;
-	osm_mad_pool_t *p_mad_pool;
-	osm_log_t *p_log;
-	cl_plock_t *p_lock;
-} osm_smir_rcv_t;
-/*
-* FIELDS
-*	p_subn
-*		Pointer to the Subnet object for this subnet.
-*
-* SEE ALSO
-*	SM Info Receiver object
-*********/
-
-/****f* OpenSM: SM Info Receiver/osm_smir_rcv_construct
-* NAME
-*	osm_smir_rcv_construct
-*
-* DESCRIPTION
-*	This function constructs a SM Info Receiver object.
-*
-* SYNOPSIS
-*/
-void osm_smir_rcv_construct(IN osm_smir_rcv_t * const p_ctrl);
-/*
-* PARAMETERS
-*	p_ctrl
-*		[in] Pointer to a SM Info Receiver object to construct.
-*
-* RETURN VALUE
-*	This function does not return a value.
-*
-* NOTES
-*	Allows calling osm_smir_rcv_init, osm_smir_rcv_destroy
-*
-*	Calling osm_smir_rcv_construct is a prerequisite to calling any other
-*	method except osm_smir_rcv_init.
-*
-* SEE ALSO
-*	SM Info Receiver object, osm_smir_rcv_init, osm_smir_rcv_destroy
-*********/
-
-/****f* OpenSM: SM Info Receiver/osm_smir_rcv_destroy
-* NAME
-*	osm_smir_rcv_destroy
-*
-* DESCRIPTION
-*	The osm_smir_rcv_destroy function destroys the object, releasing
-*	all resources.
-*
-* SYNOPSIS
-*/
-void osm_smir_rcv_destroy(IN osm_smir_rcv_t * const p_ctrl);
-/*
-* PARAMETERS
-*	p_ctrl
-*		[in] Pointer to the object to destroy.
-*
-* RETURN VALUE
-*	This function does not return a value.
-*
-* NOTES
-*	Performs any necessary cleanup of the specified
-*	SM Info Receiver object.
-*	Further operations should not be attempted on the destroyed object.
-*	This function should only be called after a call to
-*	osm_smir_rcv_construct or osm_smir_rcv_init.
-*
-* SEE ALSO
-*	SM Info Receiver object, osm_smir_rcv_construct,
-*	osm_smir_rcv_init
-*********/
-
-/****f* OpenSM: SM Info Receiver/osm_smir_rcv_init
-* NAME
-*	osm_smir_rcv_init
-*
-* DESCRIPTION
-*	The osm_smir_rcv_init function initializes a
-*	SM Info Receiver object for use.
-*
-* SYNOPSIS
-*/
-ib_api_status_t osm_smir_rcv_init(IN osm_smir_rcv_t * const p_ctrl,
-				  IN osm_sa_resp_t * const p_resp,
-				  IN osm_mad_pool_t * const p_mad_pool,
-				  IN osm_subn_t * const p_subn,
-				  IN osm_stats_t * const p_stats,
-				  IN osm_log_t * const p_log,
-				  IN cl_plock_t * const p_lock);
-/*
-* PARAMETERS
-*	p_ctrl
-*		[in] Pointer to an osm_smir_rcv_t object to initialize.
-*
-*	p_req
-*		[in] Pointer to an osm_req_t object.
-*
-*	p_subn
-*		[in] Pointer to the Subnet object for this subnet.
-*
-*	p_stats
-*		[in] Pointer to the Statistics object for this subnet.
-*
-*	p_log
-*		[in] Pointer to the log object.
-*
-*	p_lock
-*		[in] Pointer to the OpenSM serializing lock.
-*
-* RETURN VALUES
-*	CL_SUCCESS if the SM Info Receiver object was initialized
-*	successfully.
-*
-* NOTES
-*	Allows calling other SM Info Receiver methods.
-*
-* SEE ALSO
-*	SM Info Receiver object, osm_smir_rcv_construct, osm_smir_rcv_destroy
-*********/
-
-/****f* OpenSM: SM Info Receiver/osm_smir_rcv_process
-* NAME
-*	osm_smir_rcv_process
-*
-* DESCRIPTION
-*	Process the SMInfoRecord attribute.
-*
-* SYNOPSIS
-*/
-void osm_smir_rcv_process(IN void *context, IN void *data);
-/*
-* PARAMETERS
-*	context
-*		[in] Pointer to an osm_smir_rcv_t object.
-*
-*	data
-*		[in] Pointer to the MAD Wrapper containing the MAD
-*		that contains the node's SMInfoRecord attribute.
-*
-* RETURN VALUES
-*	CL_SUCCESS if the SMInfoRecord processing was successful.
-*
-* NOTES
-*	This function processes a SMInfoRecord attribute.
-*
-* SEE ALSO
-*	SM Info Receiver, SM Info Response Controller
-*********/
-
-END_C_DECLS
-#endif				/* _OSM_SMIR_H_ */
diff --git a/opensm/include/opensm/osm_sa_sw_info_record.h b/opensm/include/opensm/osm_sa_sw_info_record.h
deleted file mode 100644
index df6f842..0000000
--- a/opensm/include/opensm/osm_sa_sw_info_record.h
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * Copyright (c) 2006-2007 Voltaire, Inc. All rights reserved.
- * Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
- * Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
- *
- * This software is available to you under a choice of one of two
- * licenses.  You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
- *
- *     Redistribution and use in source and binary forms, with or
- *     without modification, are permitted provided that the following
- *     conditions are met:
- *
- *      - Redistributions of source code must retain the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-/*
- * Abstract:
- * 	Declaration of osm_sir_rcv_t.
- *	This object represents the SwitchInfo Receiver object.
- *	attribute from a switch node.
- *	This object is part of the OpenSM family of objects.
- *
- * Environment:
- * 	Linux User Mode
- *
- */
-
-#ifndef _OSM_SIR_RCV_H_
-#define _OSM_SIR_RCV_H_
-
-#include <complib/cl_passivelock.h>
-#include <opensm/osm_base.h>
-#include <opensm/osm_madw.h>
-#include <opensm/osm_req.h>
-#include <opensm/osm_state_mgr.h>
-#include <opensm/osm_sa_response.h>
-#include <opensm/osm_subnet.h>
-#include <opensm/osm_log.h>
-
-#ifdef __cplusplus
-#  define BEGIN_C_DECLS extern "C" {
-#  define END_C_DECLS   }
-#else				/* !__cplusplus */
-#  define BEGIN_C_DECLS
-#  define END_C_DECLS
-#endif				/* __cplusplus */
-
-BEGIN_C_DECLS
-/****h* OpenSM/Switch Info Receiver
-* NAME
-*	Switch Info Receiver
-*
-* DESCRIPTION
-*	The Switch Info Receiver object encapsulates the information
-*	needed to receive the SwitchInfo attribute from a switch node.
-*
-*	The Switch Info Receiver object is thread safe.
-*
-*	This object should be treated as opaque and should be
-*	manipulated only through the provided functions.
-*
-* AUTHOR
-*	Hal Rosenstock, Voltaire
-*
-*********/
-/****s* OpenSM: Switch Info Receiver/osm_sir_rcv_t
-* NAME
-*	osm_sir_rcv_t
-*
-* DESCRIPTION
-*	Switch Info Receiver structure.
-*
-*	This object should be treated as opaque and should
-*	be manipulated only through the provided functions.
-*
-* SYNOPSIS
-*/
-typedef struct _osm_sir_rcv {
-	osm_subn_t *p_subn;
-	osm_sa_resp_t *p_resp;
-	osm_mad_pool_t *p_mad_pool;
-	osm_log_t *p_log;
-	osm_req_t *p_req;
-	osm_state_mgr_t *p_state_mgr;
-	cl_plock_t *p_lock;
-} osm_sir_rcv_t;
-/*
-* FIELDS
-*	p_subn
-*		Pointer to the Subnet object for this subnet.
-*
-*	p_log
-*		Pointer to the log object.
-*
-*	p_req
-*		Pointer to the Request object.
-*
-*	p_state_mgr
-*		Pointer to the State Manager object.
-*
-*	p_lock
-*		Pointer to the serializing lock.
-*
-* SEE ALSO
-*	Switch Info Receiver object
-*********/
-
-/****f* OpenSM: Switch Info Receiver/osm_sir_rcv_construct
-* NAME
-*	osm_sir_rcv_construct
-*
-* DESCRIPTION
-*	This function constructs a Switch Info Receiver object.
-*
-* SYNOPSIS
-*/
-void osm_sir_rcv_construct(IN osm_sir_rcv_t * const p_ctrl);
-/*
-* PARAMETERS
-*	p_ctrl
-*		[in] Pointer to a Switch Info Receiver object to construct.
-*
-* RETURN VALUE
-*	This function does not return a value.
-*
-* NOTES
-*	Allows calling osm_sir_rcv_destroy.
-*
-*	Calling osm_sir_rcv_construct is a prerequisite to calling any other
-*	method except osm_sir_rcv_init.
-*
-* SEE ALSO
-*	Switch Info Receiver object, osm_sir_rcv_init, osm_sir_rcv_destroy
-*********/
-
-/****f* OpenSM: Switch Info Receiver/osm_sir_rcv_destroy
-* NAME
-*	osm_sir_rcv_destroy
-*
-* DESCRIPTION
-*	The osm_sir_rcv_destroy function destroys the object, releasing
-*	all resources.
-*
-* SYNOPSIS
-*/
-void osm_sir_rcv_destroy(IN osm_sir_rcv_t * const p_ctrl);
-/*
-* PARAMETERS
-*	p_ctrl
-*		[in] Pointer to the object to destroy.
-*
-* RETURN VALUE
-*	This function does not return a value.
-*
-* NOTES
-*	Performs any necessary cleanup of the specified
-*	Switch Info Receiver object.
-*	Further operations should not be attempted on the destroyed object.
-*	This function should only be called after a call to
-*	osm_sir_rcv_construct or osm_sir_rcv_init.
-*
-* SEE ALSO
-*	Switch Info Receiver object, osm_sir_rcv_construct,
-*	osm_sir_rcv_init
-*********/
-
-/****f* OpenSM: Switch Info Receiver/osm_sir_rcv_init
-* NAME
-*	osm_sir_rcv_init
-*
-* DESCRIPTION
-*	The osm_sir_rcv_init function initializes a
-*	Switch Info Receiver object for use.
-*
-* SYNOPSIS
-*/
-ib_api_status_t osm_sir_rcv_init(IN osm_sir_rcv_t * const p_rcv,
-				 IN osm_sa_resp_t * const p_resp,
-				 IN osm_mad_pool_t * const p_mad_pool,
-				 IN osm_subn_t * const p_subn,
-				 IN osm_log_t * const p_log,
-				 IN cl_plock_t * const p_lock);
-/*
-* PARAMETERS
-*	p_rcv
-*		[in] Pointer to an osm_sir_rcv_t object to initialize.
-*
-*	p_resp
-*		[in] Pointer to the SA Responder object.
-*
-*	p_mad_pool
-*		[in] Pointer to the mad pool.
-*
-*	p_subn
-*		[in] Pointer to the Subnet object for this subnet.
-*
-*	p_log
-*		[in] Pointer to the log object.
-*
-*	p_lock
-*		[in] Pointer to the OpenSM serializing lock.
-*
-* RETURN VALUES
-*	IB_SUCCESS if the Switch Info Receiver object was initialized
-*	successfully.
-*
-* NOTES
-*	Allows calling other Switch Info Receiver methods.
-*
-* SEE ALSO
-*	Switch Info Receiver object, osm_sir_rcv_construct,
-*	osm_sir_rcv_destroy
-*********/
-
-/****f* OpenSM: Switch Info Receiver/osm_sir_rcv_process
-* NAME
-*	osm_sir_rcv_process
-*
-* DESCRIPTION
-*	Process the SwitchInfo attribute.
-*
-* SYNOPSIS
-*/
-void osm_sir_rcv_process(IN void *context, IN void *data);
-/*
-* PARAMETERS
-*	context
-*		[in] Pointer to an osm_sir_rcv_t object.
-*
-*	data
-*		[in] Pointer to the MAD Wrapper containing the MAD
-*		that contains the node's SwitchInfo attribute.
-*
-* RETURN VALUES
-*	CL_SUCCESS if the SwitchInfo processing was successful.
-*
-* NOTES
-*	This function processes a SwitchInfo attribute.
-*
-* SEE ALSO
-*	Switch Info Receiver, Switch Info Response Controller
-*********/
-
-END_C_DECLS
-#endif				/* _OSM_SIR_RCV_H_ */
diff --git a/opensm/include/opensm/osm_sa_vlarb_record.h b/opensm/include/opensm/osm_sa_vlarb_record.h
deleted file mode 100644
index 1ed8554..0000000
--- a/opensm/include/opensm/osm_sa_vlarb_record.h
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * Copyright (c) 2004-2007 Voltaire, Inc. All rights reserved.
- * Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
- * Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
- *
- * This software is available to you under a choice of one of two
- * licenses.  You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
- *
- *     Redistribution and use in source and binary forms, with or
- *     without modification, are permitted provided that the following
- *     conditions are met:
- *
- *      - Redistributions of source code must retain the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-/*
- * Abstract:
- * 	Declaration of osm_vlarb_rec_rcv_t.
- *	This object represents the VLArbitration Record Receiver object.
- *	attribute from a node.
- *	This object is part of the OpenSM family of objects.
- *
- * Environment:
- * 	Linux User Mode
- *
- * $Revision: 1.3 $
- */
-
-#ifndef _OSM_VLARB_REC_RCV_H_
-#define _OSM_VLARB_REC_RCV_H_
-
-#include <complib/cl_passivelock.h>
-#include <opensm/osm_base.h>
-#include <opensm/osm_madw.h>
-#include <opensm/osm_sa_response.h>
-#include <opensm/osm_subnet.h>
-#include <opensm/osm_port.h>
-#include <opensm/osm_log.h>
-
-#ifdef __cplusplus
-#  define BEGIN_C_DECLS extern "C" {
-#  define END_C_DECLS   }
-#else				/* !__cplusplus */
-#  define BEGIN_C_DECLS
-#  define END_C_DECLS
-#endif				/* __cplusplus */
-
-BEGIN_C_DECLS
-/****h* OpenSM/VLArbitration Record Receiver
-* NAME
-*	VLArbitration Record Receiver
-*
-* DESCRIPTION
-*	The VLArbitration Record Receiver object encapsulates the information
-*	needed to handle VL Arbitration Record query from a SA.
-*
-*	The VLArbitration Record Receiver object is thread safe.
-*
-*	This object should be treated as opaque and should be
-*	manipulated only through the provided functions.
-*
-* AUTHOR
-*	Eitan Zahavi, Mellanox
-*
-*********/
-/****s* OpenSM: VLArbitration Record Receiver/osm_vlarb_rec_rcv_t
-* NAME
-*	osm_vlarb_rec_rcv_t
-*
-* DESCRIPTION
-*	VLArbitration Record Receiver structure.
-*
-*	This object should be treated as opaque and should
-*	be manipulated only through the provided functions.
-*
-* SYNOPSIS
-*/
-typedef struct _osm_vlarb_rec_rcv {
-	osm_subn_t *p_subn;
-	osm_sa_resp_t *p_resp;
-	osm_mad_pool_t *p_mad_pool;
-	osm_log_t *p_log;
-	cl_plock_t *p_lock;
-} osm_vlarb_rec_rcv_t;
-/*
-* FIELDS
-*	p_subn
-*		Pointer to the Subnet object for this subnet.
-*
-*	p_resp
-*		Pointer to the SA responder.
-*
-*	p_mad_pool
-*		Pointer to the mad pool.
-*
-*	p_log
-*		Pointer to the log object.
-*
-*	p_lock
-*		Pointer to the serializing lock.
-*
-* SEE ALSO
-*
-*********/
-
-/****f* OpenSM: VLArbitration Record Receiver/osm_vlarb_rec_rcv_construct
-* NAME
-*	osm_vlarb_rec_rcv_construct
-*
-* DESCRIPTION
-*	This function constructs a VLArbitration Record Receiver object.
-*
-* SYNOPSIS
-*/
-void osm_vlarb_rec_rcv_construct(IN osm_vlarb_rec_rcv_t * const p_rcv);
-/*
-* PARAMETERS
-*	p_rcv
-*		[in] Pointer to a VLArbitration Record Receiver object to construct.
-*
-* RETURN VALUE
-*	This function does not return a value.
-*
-* NOTES
-*	Allows calling osm_vlarb_rec_rcv_init, osm_vlarb_rec_rcv_destroy
-*
-*	Calling osm_vlarb_rec_rcv_construct is a prerequisite to calling any other
-*	method except osm_vlarb_rec_rcv_init.
-*
-* SEE ALSO
-*	VLArbitration Record Receiver object, osm_vlarb_rec_rcv_init,
-*	osm_vlarb_rec_rcv_destroy
-*********/
-
-/****f* OpenSM: VLArbitration Record Receiver/osm_vlarb_rec_rcv_destroy
-* NAME
-*	osm_vlarb_rec_rcv_destroy
-*
-* DESCRIPTION
-*	The osm_vlarb_rec_rcv_destroy function destroys the object, releasing
-*	all resources.
-*
-* SYNOPSIS
-*/
-void osm_vlarb_rec_rcv_destroy(IN osm_vlarb_rec_rcv_t * const p_rcv);
-/*
-* PARAMETERS
-*	p_rcv
-*		[in] Pointer to the object to destroy.
-*
-* RETURN VALUE
-*	This function does not return a value.
-*
-* NOTES
-*	Performs any necessary cleanup of the specified
-*	VLArbitration Record Receiver object.
-*	Further operations should not be attempted on the destroyed object.
-*	This function should only be called after a call to
-*	osm_vlarb_rec_rcv_construct or osm_vlarb_rec_rcv_init.
-*
-* SEE ALSO
-*	VLArbitration Record Receiver object, osm_vlarb_rec_rcv_construct,
-*	osm_vlarb_rec_rcv_init
-*********/
-
-/****f* OpenSM: VLArbitration Record Receiver/osm_vlarb_rec_rcv_init
-* NAME
-*	osm_vlarb_rec_rcv_init
-*
-* DESCRIPTION
-*	The osm_vlarb_rec_rcv_init function initializes a
-*	VLArbitration Record Receiver object for use.
-*
-* SYNOPSIS
-*/
-ib_api_status_t
-osm_vlarb_rec_rcv_init(IN osm_vlarb_rec_rcv_t * const p_rcv,
-		       IN osm_sa_resp_t * const p_resp,
-		       IN osm_mad_pool_t * const p_mad_pool,
-		       IN osm_subn_t * const p_subn,
-		       IN osm_log_t * const p_log,
-		       IN cl_plock_t * const p_lock);
-/*
-* PARAMETERS
-*	p_rcv
-*		[in] Pointer to an osm_vlarb_rec_rcv_t object to initialize.
-*
-*	p_req
-*		[in] Pointer to an osm_req_t object.
-*
-*	p_subn
-*		[in] Pointer to the Subnet object for this subnet.
-*
-*	p_log
-*		[in] Pointer to the log object.
-*
-*	p_lock
-*		[in] Pointer to the OpenSM serializing lock.
-*
-* RETURN VALUES
-*	CL_SUCCESS if the VLArbitration Record Receiver object was initialized
-*	successfully.
-*
-* NOTES
-*	Allows calling other VLArbitration Record Receiver methods.
-*
-* SEE ALSO
-*	VLArbitration Record Receiver object, osm_vlarb_rec_rcv_construct,
-*	osm_vlarb_rec_rcv_destroy
-*********/
-
-/****f* OpenSM: VLArbitration Record Receiver/osm_vlarb_rec_rcv_process
-* NAME
-*	osm_vlarb_rec_rcv_process
-*
-* DESCRIPTION
-*	Process the VL Arbitration Table Query .
-*
-* SYNOPSIS
-*/
-void osm_vlarb_rec_rcv_process(IN void *context, IN void *data);
-/*
-* PARAMETERS
-*	context
-*		[in] Pointer to an osm_vlarb_rec_rcv_t object.
-*
-*	data
-*		[in] Pointer to the MAD Wrapper containing the MAD
-*		that contains the VL Arbitration Record Query attribute.
-*
-* RETURN VALUES
-*	CL_SUCCESS if the Query processing was successful.
-*
-* NOTES
-*	This function processes a SA VL Arbitration Record attribute.
-*
-* SEE ALSO
-*	VLArbitration Record Receiver, VLArbitration Record Response Controller
-*********/
-
-END_C_DECLS
-#endif				/* _OSM_VLARB_REC_RCV_H_ */
-- 
1.5.3.4.206.g58ba4




More information about the general mailing list