From patchwork Tue Apr 13 16:58:57 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Khapyorsky X-Patchwork-Id: 92218 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 o3DGwnu2025357 for ; Tue, 13 Apr 2010 16:58:49 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750800Ab0DMQ6s (ORCPT ); Tue, 13 Apr 2010 12:58:48 -0400 Received: from mail-wy0-f174.google.com ([74.125.82.174]:39176 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750755Ab0DMQ6s (ORCPT ); Tue, 13 Apr 2010 12:58:48 -0400 Received: by wyf19 with SMTP id 19so294301wyf.19 for ; Tue, 13 Apr 2010 09:58:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:received:date:from:to :cc:subject:message-id:references:mime-version:content-type :content-disposition:in-reply-to:user-agent; bh=osygV97S+xAvOVhZioggaKRM419U7xEVU7O2glWnpE4=; b=b8WWhgAIZPD+laMyG6k0PyQXXan/RzrJlY4pSJBpDJNDtluM+2rqPPcVDn3kZG0xdd +kUHJ3YNb0TqA441+9Gj/KSrIWUusJMzXpFaAD9S1AN6caYarg2/6/Iym8X3czRh5r12 D+Ay4Zs4kHdImcIu3eCH0cvZCubCBYS/js6Nw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=c+WF2thRWGWIAYfFt0teozoFaJRMKzeaRrHQrr1dHbd4f8pgFv1a9H6h7SRzrOEnzl SVugExmMXhuPRcSSlepB3H6sXDcSOt4uN1ZOnEp9by0pYWT74x0yuD3wFFXCv69wn0EU OkQC3gyscJE2td6+SK6taOatZqxsYcMZgVvi4= Received: by 10.216.158.70 with SMTP id p48mr2583258wek.90.1271177926169; Tue, 13 Apr 2010 09:58:46 -0700 (PDT) Received: from me.localdomain (85.64.35.106.dynamic.barak-online.net [85.64.35.106]) by mx.google.com with ESMTPS id r29sm1996499wbv.15.2010.04.13.09.58.44 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 13 Apr 2010 09:58:45 -0700 (PDT) Received: by me.localdomain (Postfix, from userid 1000) id 888E611F31; Tue, 13 Apr 2010 19:58:57 +0300 (IDT) Date: Tue, 13 Apr 2010 19:58:57 +0300 From: Sasha Khapyorsky To: Ira Weiny Cc: "linux-rdma@vger.kernel.org" , Hal Rosenstock Subject: [PATCH] libibnetdisc: don't try to cross discovery over CA Message-ID: <20100413165857.GO10830@me> References: <20100218124933.c018a23d.weiny2@llnl.gov> <20100413104658.GA10830@me> <20100413165325.GN10830@me> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20100413165325.GN10830@me> User-Agent: Mutt/1.5.20 (2009-06-14) 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, 13 Apr 2010 16:58:53 +0000 (UTC) diff --git a/infiniband-diags/libibnetdisc/src/ibnetdisc.c b/infiniband-diags/libibnetdisc/src/ibnetdisc.c index 03b678e..2ce15b7 100644 --- a/infiniband-diags/libibnetdisc/src/ibnetdisc.c +++ b/infiniband-diags/libibnetdisc/src/ibnetdisc.c @@ -200,7 +200,7 @@ static int recv_port_info(smp_engine_t * engine, ibnd_smp_t * smp, if (port_num && mad_get_field(port->info, 0, IB_PORT_PHYS_STATE_F) == IB_PORT_PHYS_STATE_LINKUP && ((node->type == IB_NODE_SWITCH && port_num != local_port) || - node == fabric->from_node)) { + (node == fabric->from_node && port_num == local_port))) { ib_portid_t path = smp->path; if (extend_dpath(engine, &path, port_num) > 0) query_node_info(engine, &path, node);