From: eitan <eitan@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Tue, 4 Apr 2006 08:51:02 +0000 (+0000)
Subject: [OPENSM] 1. AL_INLINE in Opensm maped to static inline to solve linker function override
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=36bfa7ea4a20e21dad3072e12fd09a57c59b36b4;p=~shefty%2Frdma-win.git

[OPENSM] 1. AL_INLINE in Opensm maped to static inline to solve linker function override
2. ibtrapgen sm_lid bug



git-svn-id: svn://openib.tc.cornell.edu/gen1@278 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86
---

diff --git a/trunk/ulp/opensm/user/ibtrapgen/ibtrapgen.c b/trunk/ulp/opensm/user/ibtrapgen/ibtrapgen.c
index f5663a54..2476ce4d 100644
--- a/trunk/ulp/opensm/user/ibtrapgen/ibtrapgen.c
+++ b/trunk/ulp/opensm/user/ibtrapgen/ibtrapgen.c
@@ -356,8 +356,8 @@ ibtrapgen_run( IN ibtrapgen_t * const p_ibtrapgen )
            p_ibtrapgen->p_opt->lid,
            p_ibtrapgen->p_opt->number );
   
-  printf("-V- SM lid is : 0x%04X\n",p_ibtrapgen->p_opt->sm_lid);
-  mad_addr.dest_lid = cl_ntoh16(p_ibtrapgen->p_opt->sm_lid);
+  printf("-V- SM lid is : 0x%04X\n",cl_ntoh16(p_ibtrapgen->p_opt->sm_lid));
+  mad_addr.dest_lid = (p_ibtrapgen->p_opt->sm_lid);
   /* ??? - what is path_bits? What should be the value here?? */
   mad_addr.path_bits = 0;
   /* ??? - what is static_rate? What should be the value here?? */
diff --git a/trunk/ulp/opensm/user/include/iba/ib_types.h b/trunk/ulp/opensm/user/include/iba/ib_types.h
index 97e4e38e..9fb32976 100644
--- a/trunk/ulp/opensm/user/include/iba/ib_types.h
+++ b/trunk/ulp/opensm/user/include/iba/ib_types.h
@@ -64,7 +64,7 @@ BEGIN_C_DECLS
         #define AL_INLINE	static inline
     #else
         #define AL_API		__stdcall
-        #define AL_INLINE	AL_EXPORT inline
+        #define AL_INLINE	static inline
         /* Defined for some unique access function that are defined only in osm ib_types */
         #define OSM_INLINE static inline
     #endif	/* CL_KERNEL */
diff --git a/trunk/ulp/opensm/user/include/iba/ib_types_extended.h b/trunk/ulp/opensm/user/include/iba/ib_types_extended.h
index b3672902..5ca36487 100644
--- a/trunk/ulp/opensm/user/include/iba/ib_types_extended.h
+++ b/trunk/ulp/opensm/user/include/iba/ib_types_extended.h
@@ -48,7 +48,7 @@
         	#define AL_INLINE	static inline
 	#else
 		#define AL_API		__stdcall
-                #define AL_INLINE	AL_EXPORT inline
+		#define AL_INLINE	static  inline
 	#endif	/* CL_KERNEL */
 #else
 	#define AL_EXPORT	extern