[openib-general] [PATCH] OpenSM include/opensm/osm_madw.h: Only include arbitary context when needed

[Hal Rosenstock]

OpenSM include/opensm/osm_madw.h: Only include arbitary context when
needed (e.g. not OpenIB)

Signed-off-by: Hal Rosenstock <halr at voltaire.com>

Index: include/opensm/osm_madw.h
===================================================================
--- include/opensm/osm_madw.h	(revision 5387)
+++ include/opensm/osm_madw.h	(working copy)
@@ -315,6 +315,7 @@ typedef struct _osm_vla_context
   boolean_t			   set_method;
 } osm_vla_context_t;
 /*********/
+#ifndef OSM_VENDOR_INTF_OPENIB
 /****s* OpenSM: MAD Wrapper/osm_arbitrary_context_t
 * NAME
 *	osm_sa_context_t
@@ -330,7 +331,7 @@ typedef struct _osm_arbitrary_context
   void*             context2;
 } osm_arbitrary_context_t;
 /*********/
-
+#endif
 /****s* OpenSM: MAD Wrapper/osm_madw_context_t
 * NAME
 *	osm_madw_context_t
@@ -351,7 +352,9 @@ typedef union _osm_madw_context
 	osm_smi_context_t		smi_context;
 	osm_slvl_context_t	slvl_context;
 	osm_pkey_context_t	pkey_context;
+#ifndef OSM_VENDOR_INTF_OPENIB
 	osm_arbitrary_context_t arb_context;
+#endif
 } osm_madw_context_t;
 /*********/
 
@@ -880,6 +883,7 @@ osm_madw_get_slvl_context_ptr(
 *
 * SEE ALSO
 *********/
+
 /****f* OpenSM: MAD Wrapper/osm_madw_get_vla_context_ptr
 * NAME
 *	osm_madw_get_vla_context_ptr
@@ -908,6 +912,7 @@ osm_madw_get_vla_context_ptr(
 * SEE ALSO
 *********/
 
+#ifndef OSM_VENDOR_INTF_OPENIB
 /****f* OpenSM: MAD Wrapper/osm_madw_get_arbitrary_context_ptr
 * NAME
 *	osm_madw_get_arbitrary_context_ptr
@@ -935,6 +940,7 @@ osm_madw_get_arbitrary_context_ptr(
 *
 * SEE ALSO
 *********/
+#endif
 
 /****f* OpenSM: MAD Wrapper/osm_madw_get_vend_ptr
 * NAME