From patchwork Wed Oct 28 23:52:11 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Al Chu X-Patchwork-Id: 56385 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 n9T02oiF011730 for ; Thu, 29 Oct 2009 00:02:51 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756001AbZJ2ABi (ORCPT ); Wed, 28 Oct 2009 20:01:38 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756015AbZJ2ABh (ORCPT ); Wed, 28 Oct 2009 20:01:37 -0400 Received: from nspiron-3.llnl.gov ([128.115.41.83]:63312 "EHLO smtp.llnl.gov" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756001AbZJ2ABd (ORCPT ); Wed, 28 Oct 2009 20:01:33 -0400 X-Attachments: 0002-remove-dist-field-from-ibnd_node_t-which-was-virt.patch Received: from auk31.llnl.gov (HELO [134.9.93.159]) ([134.9.93.159]) by smtp.llnl.gov with ESMTP; 28 Oct 2009 16:52:12 -0700 Subject: [infiniband-diags] [PATCH] [2/2] remove 'dist' field from ibnd_node_t, which was virtually not used From: Al Chu Reply-To: chu11@llnl.gov To: sashak@voltaire.com Cc: linux-rdma@vger.kernel.org Date: Wed, 28 Oct 2009 16:52:11 -0700 Message-Id: <1256773931.4819.192.camel@auk31.llnl.gov> Mime-Version: 1.0 X-Mailer: Evolution 2.12.3 (2.12.3-19.el5) Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org diff --git a/infiniband-diags/libibnetdisc/include/infiniband/ibnetdisc.h b/infiniband-diags/libibnetdisc/include/infiniband/ibnetdisc.h index 8303175..a8d290c 100644 --- a/infiniband-diags/libibnetdisc/include/infiniband/ibnetdisc.h +++ b/infiniband-diags/libibnetdisc/include/infiniband/ibnetdisc.h @@ -48,7 +48,6 @@ typedef struct ibnd_node { struct ibnd_node *next; /* all node list in fabric */ ib_portid_t path_portid; /* path from "from_node" */ - int dist; /* num of hops from "from_node" */ int smalid; int smalmc; diff --git a/infiniband-diags/libibnetdisc/src/ibnetdisc.c b/infiniband-diags/libibnetdisc/src/ibnetdisc.c index b25c3d0..047b705 100644 --- a/infiniband-diags/libibnetdisc/src/ibnetdisc.c +++ b/infiniband-diags/libibnetdisc/src/ibnetdisc.c @@ -387,9 +387,8 @@ static void add_to_type_list(ibnd_node_t * node, ibnd_fabric_t * fabric) } } -static void add_to_nodedist(ibnd_node_t * node, ibnd_scan_t * ibnd_scan) +static void add_to_nodedist(ibnd_node_t * node, ibnd_scan_t * ibnd_scan, int dist) { - int dist = node->dist; if (node->type != IB_NODE_SWITCH) dist = MAXHOPS; /* special Ca list */ @@ -410,7 +409,6 @@ static ibnd_node_t *create_node(ibnd_fabric_t * fabric, ibnd_scan_t * ibnd_scan, } memcpy(node, temp, sizeof(*node)); - node->dist = dist; node->path_portid = *path; add_to_nodeguid_hash(node, fabric->nodestbl); @@ -420,7 +418,7 @@ static ibnd_node_t *create_node(ibnd_fabric_t * fabric, ibnd_scan_t * ibnd_scan, fabric->nodes = (ibnd_node_t *) node; add_to_type_list(node, fabric); - add_to_nodedist(node, ibnd_scan); + add_to_nodedist(node, ibnd_scan, dist); return node; }