From patchwork Sat May 22 13:16:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Khapyorsky X-Patchwork-Id: 101635 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 o4MDG8Zn028799 for ; Sat, 22 May 2010 13:16:08 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753871Ab0EVNQH (ORCPT ); Sat, 22 May 2010 09:16:07 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:52140 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753587Ab0EVNQG (ORCPT ); Sat, 22 May 2010 09:16:06 -0400 Received: by fxm5 with SMTP id 5so1498556fxm.19 for ; Sat, 22 May 2010 06:16: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:references:mime-version:content-type :content-disposition:in-reply-to:user-agent; bh=Xbt81XIxThpKB7y3fvx0kUH1GJPMGu9AO7sYEUPuks8=; b=KlC681pPtssIleDmAUS+LUBbhAdC0aKNBpqKHyFYn8AILyEkIGXXFNgX4MlqeDPtuj NzRCc2tsR9NojeBMHUkIVdI3WRXIpdf3TwROVvVIaCEV0an6OxUsGJuSPnsKxXLGP9yA rZ2/hVUzNg3+Gux6BxRqc2nAV3hBLz/0yNKYQ= 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=jzTZQil2NKg9f5AbssQvRBYZjB5IzCBVByU/E8OQXFGBX2RimIaUcIQ8ZUoBz4/bk+ 3YGX4pHKpf8FOpTVQGyt22iRkGT/IDURRx+R4F7OcIWWGettV2LalnvtYj0neeRaw4EK v5QHN3shQJrV5r1OvLSVR2mqJg8ba1vIbiDyM= Received: by 10.223.92.152 with SMTP id r24mr2642246fam.74.1274534164300; Sat, 22 May 2010 06:16:04 -0700 (PDT) Received: from me.localdomain (87.69.36.170.cable.012.net.il [87.69.36.170]) by mx.google.com with ESMTPS id z12sm9542321fah.21.2010.05.22.06.16.03 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 22 May 2010 06:16:03 -0700 (PDT) Received: by me.localdomain (Postfix, from userid 1000) id 2AF8611DF7; Sat, 22 May 2010 16:16:47 +0300 (IDT) Date: Sat, 22 May 2010 16:16:47 +0300 From: Sasha Khapyorsky To: linux-rdma Cc: Eli Dorfman , Alex Netes Subject: [PATCH] opensm/osm_lid_mgr: revert 'coming_out_of_standby' replacement patch Message-ID: <20100522131647.GQ28549@me> References: <20100426104838.GS23994@me> <20100522130941.GP28549@me> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20100522130941.GP28549@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]); Sat, 22 May 2010 13:16:08 +0000 (UTC) diff --git a/opensm/opensm/osm_lid_mgr.c b/opensm/opensm/osm_lid_mgr.c index 7da4eb0..97b1de6 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->first_time_master_sweep == TRUE) { + if (p_mgr->p_subn->coming_out_of_standby == TRUE) { osm_db_clear(p_mgr->p_g2l); memset(p_mgr->used_lids, 0, sizeof(p_mgr->used_lids)); if (p_mgr->p_subn->opt.honor_guid2lid_file == FALSE)