From: Honggang Li <honli@xxxxxxxxxx> The opensm/osm_attrib_req.h only defines one structure osm_attrib_req, which is unused. Please note, this patch modifies the file 'opensm/Makefile.am', so it needs re-run 'configure' script to update corresponding makefile. Signed-off-by: Honggang Li <honli@xxxxxxxxxx> --- include/opensm/osm_attrib_req.h | 108 ---------------------------------------- opensm/Makefile.am | 1 - opensm/osm_req.c | 1 - opensm/osm_resp.c | 1 - 4 files changed, 111 deletions(-) delete mode 100644 include/opensm/osm_attrib_req.h diff --git a/include/opensm/osm_attrib_req.h b/include/opensm/osm_attrib_req.h deleted file mode 100644 index c9c4886c..00000000 --- a/include/opensm/osm_attrib_req.h +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright (c) 2004-2008 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_ATTRIB_REQ_H_ -#define _OSM_ATTRIB_REQ_H_ - -#include <opensm/osm_path.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 -/* - * Abstract: - * Declaration of the attribute request object. This object - * encapsulates information needed by the generic request controller - * to request an attribute from a node. - * These objects are part of the OpenSM family of objects. - */ -/****h* OpenSM/Attribute Request -* NAME -* Attribute Request -* -* DESCRIPTION -* The Attribute Request structure encapsulates -* encapsulates information needed by the generic request controller -* to request an attribute from a node. -* -* This structure allows direct access to member variables. -* -* AUTHOR -* Steve King, Intel -* -*********/ -/****s* OpenSM: Attribute Request/osm_attrib_req_t -* NAME -* osm_attrib_req_t -* -* DESCRIPTION -* Attribute request structure. -* -* This structure allows direct access to member variables. -* -* SYNOPSIS -*/ -typedef struct osm_attrib_req { - uint16_t attrib_id; - uint32_t attrib_mod; - osm_madw_context_t context; - osm_dr_path_t path; - cl_disp_msgid_t err_msg; -} osm_attrib_req_t; -/* -* FIELDS -* attrib_id -* Attribute ID for this request. -* -* attrib_mod -* Attribute modifier for this request. -* -* context -* Context to insert in outbound mad wrapper context. -* -* path -* The directed route path to the node. -* -* SEE ALSO -*********/ - -END_C_DECLS -#endif /* _OSM_ATTRIB_REQ_H_ */ diff --git a/opensm/Makefile.am b/opensm/Makefile.am index 658cc86d..d6d7ffeb 100644 --- a/opensm/Makefile.am +++ b/opensm/Makefile.am @@ -69,7 +69,6 @@ opensm_LDADD = -L../complib -losmcomp -L../libvendor -losmvendor -L. -lopensm $( opensmincludedir = $(includedir)/infiniband/opensm opensminclude_HEADERS = \ - $(srcdir)/../include/opensm/osm_attrib_req.h \ $(srcdir)/../include/opensm/osm_base.h \ $(srcdir)/../include/opensm/osm_console.h \ $(srcdir)/../include/opensm/osm_console_io.h \ diff --git a/opensm/osm_req.c b/opensm/osm_req.c index c085fdaf..0664f624 100644 --- a/opensm/osm_req.c +++ b/opensm/osm_req.c @@ -51,7 +51,6 @@ #include <opensm/osm_file_ids.h> #define FILE_ID OSM_FILE_REQ_C #include <opensm/osm_madw.h> -#include <opensm/osm_attrib_req.h> #include <opensm/osm_log.h> #include <opensm/osm_helper.h> #include <opensm/osm_mad_pool.h> diff --git a/opensm/osm_resp.c b/opensm/osm_resp.c index 59a73e08..3f270e66 100644 --- a/opensm/osm_resp.c +++ b/opensm/osm_resp.c @@ -50,7 +50,6 @@ #include <opensm/osm_file_ids.h> #define FILE_ID OSM_FILE_RESP_C #include <opensm/osm_madw.h> -#include <opensm/osm_attrib_req.h> #include <opensm/osm_log.h> #include <opensm/osm_helper.h> #include <opensm/osm_mad_pool.h> -- 2.14.4