From patchwork Tue Apr 19 19:05:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Rosenstock X-Patchwork-Id: 718721 X-Patchwork-Delegate: alexne@voltaire.com 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 p3JJ5LOG015079 for ; Tue, 19 Apr 2011 19:05:21 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751888Ab1DSTFU (ORCPT ); Tue, 19 Apr 2011 15:05:20 -0400 Received: from mail-ww0-f44.google.com ([74.125.82.44]:56040 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751595Ab1DSTFT (ORCPT ); Tue, 19 Apr 2011 15:05:19 -0400 Received: by wwa36 with SMTP id 36so14779wwa.1 for ; Tue, 19 Apr 2011 12:05:18 -0700 (PDT) Received: by 10.227.173.141 with SMTP id p13mr1629594wbz.64.1303239917929; Tue, 19 Apr 2011 12:05:17 -0700 (PDT) Received: from [192.168.1.100] (c-71-192-10-85.hsd1.ma.comcast.net [71.192.10.85]) by mx.google.com with ESMTPS id bd8sm115557wbb.48.2011.04.19.12.05.14 (version=SSLv3 cipher=OTHER); Tue, 19 Apr 2011 12:05:16 -0700 (PDT) Message-ID: <4DADDCE8.1090801@dev.mellanox.co.il> Date: Tue, 19 Apr 2011 15:05:12 -0400 From: Hal Rosenstock User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.15) Gecko/20110303 Thunderbird/3.1.9 MIME-Version: 1.0 To: Alex Netes CC: "linux-rdma@vger.kernel.org" Subject: [PATCH] opensm: Fix some OSM_SIGNAL and OSM_SM_SIGNAL numbering 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.6 (demeter1.kernel.org [140.211.167.41]); Tue, 19 Apr 2011 19:05:21 +0000 (UTC) Signed-off-by: Hal Rosenstock --- -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/opensm/osm_base.h b/include/opensm/osm_base.h index 3735610..07e971d 100644 --- a/include/opensm/osm_base.h +++ b/include/opensm/osm_base.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2004-2009 Voltaire, Inc. All rights reserved. - * Copyright (c) 2002-2009 Mellanox Technologies LTD. All rights reserved. + * Copyright (c) 2002-2011 Mellanox Technologies LTD. All rights reserved. * Copyright (c) 1996-2003 Intel Corporation. All rights reserved. * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. * @@ -836,7 +836,7 @@ typedef enum _osm_thread_state { #define OSM_SIGNAL_SWEEP 1 #define OSM_SIGNAL_IDLE_TIME_PROCESS_REQUEST 2 #define OSM_SIGNAL_PERFMGR_SWEEP 3 -#define OSM_SIGNAL_MAX 3 +#define OSM_SIGNAL_MAX 4 typedef unsigned int osm_signal_t; /***********/ diff --git a/opensm/osm_helper.c b/opensm/osm_helper.c index 2a77b00..0b0580a 100644 --- a/opensm/osm_helper.c +++ b/opensm/osm_helper.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2004-2009 Voltaire, Inc. All rights reserved. - * Copyright (c) 2002-2010 Mellanox Technologies LTD. All rights reserved. + * Copyright (c) 2002-2011 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 Sun Microsystems, Inc. All rights reserved. @@ -2014,9 +2014,8 @@ static const char *sm_signal_str[] = { "OSM_SIGNAL_NONE", /* 0 */ "OSM_SIGNAL_SWEEP", /* 1 */ "OSM_SIGNAL_IDLE_TIME_PROCESS_REQUEST", /* 2 */ - "OSM_SIGNAL_EXIT_STBY", /* 3 */ - "OSM_SIGNAL_PERFMGR_SWEEP", /* 4 */ - "UNKNOWN SIGNAL!!" /* 5 */ + "OSM_SIGNAL_PERFMGR_SWEEP", /* 3 */ + "UNKNOWN SIGNAL!!" /* 4 */ }; const char *osm_get_sm_signal_str(IN osm_signal_t signal) @@ -2250,17 +2249,17 @@ const char *osm_get_lsa_str(IN uint8_t lsa) static const char *sm_mgr_signal_str[] = { "OSM_SM_SIGNAL_NONE", /* 0 */ - "OSM_SM_SIGNAL_DISCOVERY_COMPLETED", /* 2 */ - "OSM_SM_SIGNAL_POLLING_TIMEOUT", /* 3 */ - "OSM_SM_SIGNAL_DISCOVER", /* 4 */ - "OSM_SM_SIGNAL_DISABLE", /* 5 */ - "OSM_SM_SIGNAL_HANDOVER", /* 6 */ - "OSM_SM_SIGNAL_HANDOVER_SENT", /* 7 */ - "OSM_SM_SIGNAL_ACKNOWLEDGE", /* 8 */ - "OSM_SM_SIGNAL_STANDBY", /* 9 */ - "OSM_SM_SIGNAL_MASTER_OR_HIGHER_SM_DETECTED", /* 10 */ - "OSM_SM_SIGNAL_WAIT_FOR_HANDOVER", /* 11 */ - "UNKNOWN STATE!!" /* 12 */ + "OSM_SM_SIGNAL_DISCOVERY_COMPLETED", /* 1 */ + "OSM_SM_SIGNAL_POLLING_TIMEOUT", /* 2 */ + "OSM_SM_SIGNAL_DISCOVER", /* 3 */ + "OSM_SM_SIGNAL_DISABLE", /* 4 */ + "OSM_SM_SIGNAL_HANDOVER", /* 5 */ + "OSM_SM_SIGNAL_HANDOVER_SENT", /* 6 */ + "OSM_SM_SIGNAL_ACKNOWLEDGE", /* 7 */ + "OSM_SM_SIGNAL_STANDBY", /* 8 */ + "OSM_SM_SIGNAL_MASTER_OR_HIGHER_SM_DETECTED", /* 9 */ + "OSM_SM_SIGNAL_WAIT_FOR_HANDOVER", /* 10 */ + "UNKNOWN STATE!!" /* 11 */ }; const char *osm_get_sm_mgr_signal_str(IN osm_sm_signal_t signal)