From patchwork Tue Apr 20 22:30:40 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Al Chu X-Patchwork-Id: 93766 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3KMUicM028622 for ; Tue, 20 Apr 2010 22:30:44 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753363Ab0DTWan (ORCPT ); Tue, 20 Apr 2010 18:30:43 -0400 Received: from nspiron-3.llnl.gov ([128.115.41.83]:41793 "EHLO smtp.llnl.gov" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753347Ab0DTWan (ORCPT ); Tue, 20 Apr 2010 18:30:43 -0400 X-Attachments: 0001-support-diffing-nodedesc-on-remoteports-in-ibnetdisc.patch Received: from auk31.llnl.gov (HELO [134.9.93.159]) ([134.9.93.159]) by smtp.llnl.gov with ESMTP; 20 Apr 2010 15:30:41 -0700 Subject: [infiniband-diags] support diffing nodedesc on remoteports in ibnetdiscover From: Al Chu To: Sasha Khapyorsky Cc: "linux-rdma@vger.kernel.org" Date: Tue, 20 Apr 2010 15:30:40 -0700 Message-Id: <1271802640.17987.230.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 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 20 Apr 2010 22:30:44 +0000 (UTC) diff --git a/infiniband-diags/src/ibnetdiscover.c b/infiniband-diags/src/ibnetdiscover.c index 57f9625..eeb1b9f 100644 --- a/infiniband-diags/src/ibnetdiscover.c +++ b/infiniband-diags/src/ibnetdiscover.c @@ -720,6 +720,17 @@ static void diff_ports(ibnd_node_t * fabric1_node, ibnd_node_t * fabric2_node, fabric2_out++; } + if (data->diff_flags & DIFF_FLAG_PORT_CONNECTION + && data->diff_flags & DIFF_FLAG_NODE_DESCRIPTION + && fabric1_port && fabric2_port + && fabric1_port->remoteport && fabric2_port->remoteport + && memcmp(fabric1_port->remoteport->node->nodedesc, + fabric2_port->remoteport->node->nodedesc, + IB_SMP_DATA_SIZE)) { + fabric1_out++; + fabric2_out++; + } + if (fabric1_out) { diff_iter_out_header(fabric1_node, data, out_header_flag);