From patchwork Thu Jun 17 15:38:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Rosenstock X-Patchwork-Id: 106699 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 o5HFe3rE028306 for ; Thu, 17 Jun 2010 15:40:08 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753582Ab0FQPjy (ORCPT ); Thu, 17 Jun 2010 11:39:54 -0400 Received: from qmta04.westchester.pa.mail.comcast.net ([76.96.62.40]:57931 "EHLO qmta04.westchester.pa.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932665Ab0FQPjy (ORCPT ); Thu, 17 Jun 2010 11:39:54 -0400 Received: from omta03.westchester.pa.mail.comcast.net ([76.96.62.27]) by qmta04.westchester.pa.mail.comcast.net with comcast id Wz5G1e0060bG4ec543fuCU; Thu, 17 Jun 2010 15:39:54 +0000 Received: from hal.comcast.net ([75.69.247.31]) by omta03.westchester.pa.mail.comcast.net with comcast id X3ft1e0030hNrtn3P3ft6S; Thu, 17 Jun 2010 15:39:54 +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 o5HFd05Y007769; Thu, 17 Jun 2010 11:39:05 -0400 Received: (from hnrose@localhost) by hal.comcast.net (8.14.3/8.14.3/Submit) id o5HFcjt0007739; Thu, 17 Jun 2010 11:38:45 -0400 Date: Thu, 17 Jun 2010 11:38:45 -0400 From: Hal Rosenstock To: sashak@voltaire.com Cc: linux-rdma@vger.kernel.org Subject: [PATCH] opensm/osm_trap_rcv.c: No need to check for sweep for trap 145 Message-ID: <20100617153845.GA7729@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 (demeter.kernel.org [140.211.167.41]); Thu, 17 Jun 2010 15:40:08 +0000 (UTC) diff --git a/opensm/opensm/osm_trap_rcv.c b/opensm/opensm/osm_trap_rcv.c index 500632c..71429c4 100644 --- a/opensm/opensm/osm_trap_rcv.c +++ b/opensm/opensm/osm_trap_rcv.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2009 Voltaire, Inc. All rights reserved. * Copyright (c) 2002-2007 Mellanox Technologies LTD. All rights reserved. * Copyright (c) 1996-2003 Intel Corporation. All rights reserved. - * Copyright (c) 2009 HNR Consulting. All rights reserved. + * Copyright (c) 2009,2010 HNR Consulting. All rights reserved. * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU @@ -510,10 +510,12 @@ static void trap_rcv_process_request(IN osm_sm_t * sm, "ERR 3812: No physical port found for " "trap 144: \"node description update\"\n"); goto check_sweep; - } else if (cl_ntoh16(p_ntci->g_or_v.generic.trap_num) == 145) + } else if (cl_ntoh16(p_ntci->g_or_v.generic.trap_num) == 145) { /* this assumes that trap 145 content is not broken? */ p_physp->p_node->node_info.sys_guid = p_ntci->data_details.ntc_145.new_sys_guid; + goto check_report; + } check_sweep: /* do a sweep if we received a trap */