From patchwork Mon Apr 26 10:48:38 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Khapyorsky X-Patchwork-Id: 95050 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 o3QAmAd0021859 for ; Mon, 26 Apr 2010 10:48:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752833Ab0DZKsJ (ORCPT ); Mon, 26 Apr 2010 06:48:09 -0400 Received: from fg-out-1718.google.com ([72.14.220.158]:28527 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752559Ab0DZKsG (ORCPT ); Mon, 26 Apr 2010 06:48:06 -0400 Received: by fg-out-1718.google.com with SMTP id d23so2471876fga.1 for ; Mon, 26 Apr 2010 03:48:04 -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:mime-version:content-type:content-disposition :user-agent; bh=PT9mYZNTv28+Uerh9jWcwWyRoapF4J38RqFIh3Zn4W4=; b=qGWHjLpqJuZM8H8OzgkZxpglficP5EqVDFGxEA58ZPJnUVe0jknDKtVyJ861PrQwpg 4u5pIAX9jwAnRP85MXxTgpARrwJER3A2nPEC3UseHnmBRaFFtsj/ZY5fmqE9arrNSRY4 yezciTDyfEOHWstmtDkd9X8e0vyLdh/leFhdI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=k/TWqJ/RjoTpThnApWp1pp+lyKIoLzGghp6QaDUEn9K5DcqWJK5xUCXmI6vbXSY0z8 B8VoKU7ib65CLMXb6/jRfLppo1Ddi5Wtlp/0lz6kWqTy44bgsFIa+IJAqKZasUGKPHri kTS4JHDLqQT7RL5wmLm6djMIMQaRJHHpxP5BI= Received: by 10.87.38.3 with SMTP id q3mr1615998fgj.26.1272278884473; Mon, 26 Apr 2010 03:48:04 -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 e11sm4114612fga.8.2010.04.26.03.48.03 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 26 Apr 2010 03:48:03 -0700 (PDT) Received: by me.localdomain (Postfix, from userid 1000) id 6D6A111DF7; Mon, 26 Apr 2010 13:48:38 +0300 (IDT) Date: Mon, 26 Apr 2010 13:48:38 +0300 From: Sasha Khapyorsky To: linux-rdma Cc: Eli Dorfman , Alex Netes Subject: [PATCH] opensm/osm_lid_mgr: use 'first_time_master_sweep' flag Message-ID: <20100426104838.GS23994@me> MIME-Version: 1.0 Content-Disposition: inline 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]); Mon, 26 Apr 2010 10:48:10 +0000 (UTC) diff --git a/opensm/opensm/osm_lid_mgr.c b/opensm/opensm/osm_lid_mgr.c index 0fd3b20..84f3508 100644 --- a/opensm/opensm/osm_lid_mgr.c +++ b/opensm/opensm/osm_lid_mgr.c @@ -304,7 +304,7 @@ static int lid_mgr_init_sweep(IN osm_lid_mgr_t * p_mgr) info we might have. Do this only if the honor_guid2lid_file option is FALSE. If not, then need to honor this file. */ - if (p_mgr->p_subn->coming_out_of_standby == TRUE) { + if (p_mgr->p_subn->first_time_master_sweep == TRUE) { osm_db_clear(p_mgr->p_g2l); if (p_mgr->p_subn->opt.honor_guid2lid_file == FALSE) { OSM_LOG(p_mgr->p_log, OSM_LOG_DEBUG,