[ofa-general] Re: [PATCH 2/6] [ib-diag] ibroute: add support for WinOF

[Sasha Khapyorsky]

On 17:46 Wed 18 Feb     , Sean Hefty wrote:
> Signed-off-by: Sean Hefty <sean.hefty at intel.com>
> ---
> 
>  infiniband-diags/src/ibroute.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/infiniband-diags/src/ibroute.c b/infiniband-diags/src/ibroute.c
> index 144d1b2..d1049ad 100644
> --- a/infiniband-diags/src/ibroute.c
> +++ b/infiniband-diags/src/ibroute.c
> @@ -45,7 +45,7 @@
>  
>  #include <infiniband/umad.h>
>  #include <infiniband/mad.h>
> -#include <infiniband/complib/cl_nodenamemap.h>
> +#include <complib/cl_nodenamemap.h>
>  
>  #include "ibdiag_common.h"
>  
> @@ -327,7 +327,7 @@ dump_unicast_tables(ib_portid_t *portid, int startlid, int endlid)
>  
>  		for (;i < e; i++) {
>  			unsigned outport = lft[i % IB_SMP_DATA_SIZE];
> -			unsigned valid = (outport <= nports);
> +			unsigned valid = (outport <= (unsigned) nports);

Similar question.

Sasha


>From 7127f00d9020b261819d2205557646016fdd6b36 Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty at intel.com>
Date: Wed, 18 Feb 2009 17:46:38 -0800
Subject: [PATCH] ibroute: add support for WinOF

Signed-off-by: Sean Hefty <sean.hefty at intel.com>
Signed-off-by: Sasha Khapyorsky <sashak at voltaire.com>
---
 infiniband-diags/src/ibroute.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/infiniband-diags/src/ibroute.c b/infiniband-diags/src/ibroute.c
index 144d1b2..235d122 100644
--- a/infiniband-diags/src/ibroute.c
+++ b/infiniband-diags/src/ibroute.c
@@ -45,7 +45,7 @@
 
 #include <infiniband/umad.h>
 #include <infiniband/mad.h>
-#include <infiniband/complib/cl_nodenamemap.h>
+#include <complib/cl_nodenamemap.h>
 
 #include "ibdiag_common.h"
 
@@ -54,7 +54,7 @@ static int brief, dump_all, multicast;
 /*******************************************/
 
 char *
-check_switch(ib_portid_t *portid, int *nports, uint64_t *guid,
+check_switch(ib_portid_t *portid, unsigned int *nports, uint64_t *guid,
 	     uint8_t *sw, char *nd)
 {
 	uint8_t ni[IB_SMP_DATA_SIZE] = {0};
@@ -289,7 +289,8 @@ dump_unicast_tables(ib_portid_t *portid, int startlid, int endlid)
 	uint8_t sw[IB_SMP_DATA_SIZE];
 	char str[200], *s;
 	uint64_t nodeguid;
-	int block, i, e, nports, top;
+	int block, i, e, top;
+	unsigned nports;
 	int n = 0, startblock, endblock;
 
 	if ((s = check_switch(portid, &nports, &nodeguid, sw, nd)))
@@ -370,7 +371,7 @@ int main(int argc, char **argv)
 		{ "all", 'a', 0, NULL, "show all lids, even invalid entries" },
 		{ "no_dests", 'n', 0, NULL, "do not try to resolve destinations" },
 		{ "Multicast", 'M', 0, NULL, "show multicast forwarding tables" },
-		{ }
+		{ 0 }
 	};
 	char usage_args[] = "[<dest dr_path|lid|guid> [<startlid> [<endlid>]]]";
 	const char *usage_examples[] = {
-- 
1.6.1.2.319.gbd9e