Signed-off-by: Arlin Davis <[email protected]>
---
dapl/openib_ucm/cm.c | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/dapl/openib_ucm/cm.c b/dapl/openib_ucm/cm.c
index b874c8b..05b5af5 100644
--- a/dapl/openib_ucm/cm.c
+++ b/dapl/openib_ucm/cm.c
@@ -165,9 +165,9 @@ static void ucm_check_timers(dp_ib_cm_handle_t cm, int
*timer)
if ((time - cm->timer)/1000 >
(cm->hca->ib_trans.rep_time << cm->retries)) {
dapl_log(DAPL_DBG_TYPE_WARN,
- " CM_REQ retry %d %p [lid, port, qpn]:"
- " %x %x %x -> %x %x %x Time(ms) %llu >
%llu\n",
- cm, cm->retries, ntohs(cm->msg.saddr.ib.lid),
+ " CM_REQ retry %p %d [lid, port, qpn]:"
+ " %x %x %x -> %x %x %x Time(ms) %llu > %d\n",
+ cm, cm->retries+1,
ntohs(cm->msg.saddr.ib.lid),
ntohs(cm->msg.sport),
ntohl(cm->msg.saddr.ib.qpn),
ntohs(cm->msg.daddr.ib.lid),
ntohs(cm->msg.dport),
ntohl(cm->msg.dqpn), (time - cm->timer)/1000,
@@ -184,8 +184,8 @@ static void ucm_check_timers(dp_ib_cm_handle_t cm, int
*timer)
(cm->hca->ib_trans.rtu_time << cm->retries)) {
dapl_log(DAPL_DBG_TYPE_WARN,
" CM_REPLY retry %d [lid, port, qpn]:"
- " %x %x %x -> %x %x %x r_pid %x (%x) Time(ms)
%llu > %llu\n",
- cm->retries,
+ " %x %x %x -> %x %x %x r_pid %x (%x) Time(ms)
%llu > %d\n",
+ cm->retries+1,
ntohs(cm->msg.saddr.ib.lid),
ntohs(cm->msg.sport),
ntohl(cm->msg.saddr.ib.qpn),
@@ -194,7 +194,8 @@ static void ucm_check_timers(dp_ib_cm_handle_t cm, int
*timer)
ntohl(cm->msg.daddr.ib.qpn),
ntohl(*(DAT_UINT32*)cm->msg.resv),
ntohl(*(DAT_UINT32*)cm->msg.resv),
- (time - cm->timer)/1000,
cm->hca->ib_trans.rtu_time << cm->retries);
+ (time - cm->timer)/1000,
+ cm->hca->ib_trans.rtu_time << cm->retries);
cm->retries++;
dapl_os_unlock(&cm->lock);
ucm_reply(cm);
@@ -208,8 +209,8 @@ static void ucm_check_timers(dp_ib_cm_handle_t cm, int
*timer)
(cm->hca->ib_trans.rtu_time << cm->retries)) {
dapl_log(DAPL_DBG_TYPE_WARN,
" CM_DREQ retry %d [lid, port, qpn]:"
- " %x %x %x -> %x %x %x r_pid %x (%x) Time(ms)
%llu > %llu\n",
- cm->retries,
+ " %x %x %x -> %x %x %x r_pid %x (%x) Time(ms)
%llu > %d\n",
+ cm->retries+1,
ntohs(cm->msg.saddr.ib.lid),
ntohs(cm->msg.sport),
ntohl(cm->msg.saddr.ib.qpn),
@@ -218,7 +219,8 @@ static void ucm_check_timers(dp_ib_cm_handle_t cm, int
*timer)
ntohl(cm->msg.dqpn),
ntohl(*(DAT_UINT32*)cm->msg.resv),
ntohl(*(DAT_UINT32*)cm->msg.resv),
- (time - cm->timer)/1000,
cm->hca->ib_trans.rtu_time << cm->retries);
+ (time - cm->timer)/1000,
+ cm->hca->ib_trans.rtu_time << cm->retries);
cm->retries++;
dapl_os_unlock(&cm->lock);
dapli_cm_disconnect(cm);
--
1.5.2.5
_______________________________________________
ofw mailing list
[email protected]
http://lists.openfabrics.org/cgi-bin/mailman/listinfo/ofw
