[ofa-general] [PATCH 5/6 v2] [ib-diag] ibsendtrap: add support for WinOF

[Sean Hefty]

Add typecasts and modify include path.

Signed-off-by: Sean Hefty <sean.hefty at intel.com>
---
Update from v1: need casts from int to uint16.  One of the include files in
the winof tree disables certain build warnings for the callers convenience...

 infiniband-diags/src/ibsendtrap.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/infiniband-diags/src/ibsendtrap.c b/infiniband-diags/src/ibsendtrap.c
index ba6aa8b..92b72f1 100644
--- a/infiniband-diags/src/ibsendtrap.c
+++ b/infiniband-diags/src/ibsendtrap.c
@@ -43,7 +43,7 @@
 #include <getopt.h>
 
 #include <infiniband/mad.h>
-#include <infiniband/iba/ib_types.h>
+#include <iba/ib_types.h>
 
 #include "ibdiag_common.h"
 
@@ -73,8 +73,8 @@ static int send_144_node_desc_update(void)
 	notice.generic_type = 0x80 | IB_NOTICE_TYPE_INFO;
 	notice.g_or_v.generic.prod_type_lsb = cl_hton16(IB_NODE_TYPE_CA);
 	notice.g_or_v.generic.trap_num = cl_hton16(144);
-	notice.issuer_lid = cl_hton16(selfportid.lid);
-	notice.data_details.ntc_144.lid = cl_hton16(selfportid.lid);
+	notice.issuer_lid = cl_hton16((uint16_t) selfportid.lid);
+	notice.data_details.ntc_144.lid = cl_hton16((uint16_t) selfportid.lid);
 	notice.data_details.ntc_144.local_changes =
 	    TRAP_144_MASK_OTHER_LOCAL_CHANGES;
 	notice.data_details.ntc_144.change_flgs =