From: Jason Gunthorpe <jgg@xxxxxxxxxxxx>
No need for this public header included in only one place with definitions
that should not even exist in the public namespace.
Signed-off-by: Jason Gunthorpe <jgg@xxxxxxxxxxxx>
---
ibdiags/libibmad/include/infiniband/mad.h | 13 ++++-
ibdiags/libibmad/include/infiniband/mad_osd.h | 50 +------------------
2 files changed, 13 insertions(+), 50 deletions(-)
diff --git a/ibdiags/libibmad/include/infiniband/mad.h b/ibdiags/libibmad/include/infiniband/mad.h
index c95f1b10d08610..b36544988bfafd 100644
--- a/ibdiags/libibmad/include/infiniband/mad.h
+++ b/ibdiags/libibmad/include/infiniband/mad.h
@@ -35,7 +35,18 @@
#ifndef _MAD_H_
#define _MAD_H_
-#include <infiniband/mad_osd.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <byteswap.h>
+#include <inttypes.h>
+#include <arpa/inet.h>
+
+#define MAD_EXPORT
+#define DEPRECATED __attribute__ ((deprecated))
#ifdef __cplusplus
# define BEGIN_C_DECLS extern "C" {
diff --git a/ibdiags/libibmad/include/infiniband/mad_osd.h b/ibdiags/libibmad/include/infiniband/mad_osd.h
index 923be55ef95c93..061001bb8f82a6 100644
--- a/ibdiags/libibmad/include/infiniband/mad_osd.h
+++ b/ibdiags/libibmad/include/infiniband/mad_osd.h
@@ -1,49 +1 @@
-/*
- * Copyright (c) 2004-2009 Voltaire Inc. 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 _MAD_OSD_H_
-#define _MAD_OSD_H_
-
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <byteswap.h>
-#include <inttypes.h>
-#include <arpa/inet.h>
-
-#define MAD_EXPORT
-#define DEPRECATED __attribute__ ((deprecated))
-
-#endif /* _MAD_OSD_H_ */
+#warning "This header is obsolete."
--
2.21.0
