From patchwork Mon Nov 30 14:45:23 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yevgeny Kliteynik X-Patchwork-Id: 63702 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nAUEdLkk023951 for ; Mon, 30 Nov 2009 14:39:21 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752649AbZK3Oiz (ORCPT ); Mon, 30 Nov 2009 09:38:55 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752641AbZK3Oiz (ORCPT ); Mon, 30 Nov 2009 09:38:55 -0500 Received: from mail.mellanox.co.il ([194.90.237.43]:51497 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752470AbZK3Oiy (ORCPT ); Mon, 30 Nov 2009 09:38:54 -0500 Received: from Internal Mail-Server by MTLPINE1 (envelope-from kliteyn@dev.mellanox.co.il) with SMTP; 30 Nov 2009 16:45:48 +0200 Received: from [10.4.1.29] ([10.4.1.29]) by mtlexch01.mtl.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 30 Nov 2009 16:37:38 +0200 Message-ID: <4B13DA83.4070400@dev.mellanox.co.il> Date: Mon, 30 Nov 2009 16:45:23 +0200 From: Yevgeny Kliteynik Reply-To: kliteyn@dev.mellanox.co.il User-Agent: Thunderbird 1.5.0.5 (X11/20060719) MIME-Version: 1.0 To: Sasha Khapyorsky CC: Linux RDMA Subject: [PATCH] opensm/osm_vendor_mlx: fix compilation error X-OriginalArrivalTime: 30 Nov 2009 14:37:38.0733 (UTC) FILETIME=[AA42FDD0:01CA71CA] X-TM-AS-Product-Ver: SMEX-8.0.0.1181-6.000.1038-17040.007 X-TM-AS-Result: No--11.270400-8.000000-31 X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org diff --git a/opensm/include/vendor/osm_vendor_mlx.h b/opensm/include/vendor/osm_vendor_mlx.h index e67d280..867baf1 100644 --- a/opensm/include/vendor/osm_vendor_mlx.h +++ b/opensm/include/vendor/osm_vendor_mlx.h @@ -92,5 +92,8 @@ typedef struct _osm_vend_wrap { #define OSM_BIND_INVALID_HANDLE NULL #endif +/* The maximum number of retransmissions of the same MAD */ +#define OSM_DEFAULT_RETRY_COUNT 3 + END_C_DECLS #endif diff --git a/opensm/include/vendor/osm_vendor_mlx_defs.h b/opensm/include/vendor/osm_vendor_mlx_defs.h index d4c2c30..54cf286 100644 --- a/opensm/include/vendor/osm_vendor_mlx_defs.h +++ b/opensm/include/vendor/osm_vendor_mlx_defs.h @@ -52,8 +52,6 @@ BEGIN_C_DECLS /* The maximum number of outstanding MADs an RMPP sender can transmit */ #define OSMV_RMPP_RECV_WIN 16 -/* The maximum number of retransmissions of the same MAD */ -#define OSMV_MAX_RETRANSMIT 3 /* Transaction Timeout = OSMV_TXN_TIMEOUT_FACTOR * Response Timeout */ #define OSMV_TXN_TIMEOUT_FACTOR 128 /************/ diff --git a/opensm/libvendor/osm_vendor_mlx_txn.c b/opensm/libvendor/osm_vendor_mlx_txn.c index 93d17c8..60dc293 100644 --- a/opensm/libvendor/osm_vendor_mlx_txn.c +++ b/opensm/libvendor/osm_vendor_mlx_txn.c @@ -558,7 +558,7 @@ __osmv_txn_timeout_cb(IN uint64_t key, switch (osmv_txn_get_rmpp_state(p_txn)) { case OSMV_TXN_RMPP_NONE: - if (num_regs <= OSMV_MAX_RETRANSMIT) { + if (num_regs <= OSM_DEFAULT_RETRY_COUNT) { /* We still did not exceed the limit of retransmissions. * Set the next timeout's value. */ @@ -622,7 +622,7 @@ __osmv_txn_timeout_cb(IN uint64_t key, osmv_txn_get_tid(p_txn)); p_send_ctx = osmv_txn_get_rmpp_send_ctx(p_txn); - if (num_regs <= OSMV_MAX_RETRANSMIT) { + if (num_regs <= OSM_DEFAULT_RETRY_COUNT) { /* We still did not exceed the limit of retransmissions. * Set the next timeout's value. */