From patchwork Mon Oct 4 13:16:44 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Rosenstock X-Patchwork-Id: 228521 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o94HOq0i004239 for ; Mon, 4 Oct 2010 17:24:55 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752968Ab0JDNXQ (ORCPT ); Mon, 4 Oct 2010 09:23:16 -0400 Received: from qmta07.westchester.pa.mail.comcast.net ([76.96.62.64]:38758 "EHLO qmta07.westchester.pa.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751811Ab0JDNXQ (ORCPT ); Mon, 4 Oct 2010 09:23:16 -0400 Received: from omta02.westchester.pa.mail.comcast.net ([76.96.62.19]) by qmta07.westchester.pa.mail.comcast.net with comcast id Echx1f0050QuhwU57dPFBj; Mon, 04 Oct 2010 13:23:15 +0000 Received: from hal.comcast.net ([75.69.247.31]) by omta02.westchester.pa.mail.comcast.net with comcast id EdPF1f0090hNrtn3NdPFvj; Mon, 04 Oct 2010 13:23:15 +0000 Received: from hal.comcast.net (localhost.localdomain [127.0.0.1]) by hal.comcast.net (8.14.3/8.14.3) with ESMTP id o94DHLbF024655; Mon, 4 Oct 2010 09:17:27 -0400 Received: (from hnrose@localhost) by hal.comcast.net (8.14.3/8.14.3/Submit) id o94DGihQ024623; Mon, 4 Oct 2010 09:16:44 -0400 Date: Mon, 4 Oct 2010 09:16:44 -0400 From: Hal Rosenstock To: sashak@voltaire.com Cc: linux-rdma@vger.kernel.org Subject: [PATCH] opensm/osm_state_mgr.c: Don't signal DISCOVER to SM state machine when already DISCOVERING Message-ID: <20101004131644.GA24620@comcast.net> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.19 (2009-01-05) 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 (demeter1.kernel.org [140.211.167.41]); Mon, 04 Oct 2010 17:24:55 +0000 (UTC) diff --git a/opensm/opensm/osm_state_mgr.c b/opensm/opensm/osm_state_mgr.c index e7bff46..68841f8 100644 --- a/opensm/opensm/osm_state_mgr.c +++ b/opensm/opensm/osm_state_mgr.c @@ -1191,7 +1191,8 @@ repeat_discovery: osm_drop_mgr_process(sm); /* Move to DISCOVERING state */ - osm_sm_state_mgr_process(sm, OSM_SM_SIGNAL_DISCOVER); + if (sm->p_subn->sm_state != IB_SMINFO_STATE_DISCOVERING) + osm_sm_state_mgr_process(sm, OSM_SM_SIGNAL_DISCOVER); osm_opensm_report_event(sm->p_subn->p_osm, OSM_EVENT_ID_STATE_CHANGE, NULL); return;