From patchwork Mon Mar 11 17:15:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Rosenstock X-Patchwork-Id: 2249561 X-Patchwork-Delegate: hal@mellanox.com Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id EB4EB3FC8F for ; Mon, 11 Mar 2013 17:15:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753247Ab3CKRPl (ORCPT ); Mon, 11 Mar 2013 13:15:41 -0400 Received: from mail-bk0-f51.google.com ([209.85.214.51]:58241 "EHLO mail-bk0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751929Ab3CKRPk (ORCPT ); Mon, 11 Mar 2013 13:15:40 -0400 Received: by mail-bk0-f51.google.com with SMTP id ik5so1804014bkc.24 for ; Mon, 11 Mar 2013 10:15:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:message-id:date:from:user-agent:mime-version:to:subject :content-type:content-transfer-encoding:x-gm-message-state; bh=+02oFGU9mdOBG5Gwkg+/HnBiRGzjFbzG2DCp/uWQzKI=; b=nwfZSGI9bgejgcq5a9Yu/91OLOpBrG7RUfHo3Esy6oxEBM3cIE0qVgmYfq6IzlJzHA DxofLdLS68ar9sjgdwrLDb61Y5WIXKagbUF+Kw8qsYtsPofO/YK4fQ7aMifAWx9EEGK2 coFO6rSGN020OS1sVDqo4Uo7Q5Sso38yna9/3ghtrOSVQk85p4mN8kiQ9F8x1ybK7tDm 17z6rJejTQo/x+9BBTDE7+f4ENB8HKDpmhuAh3x5S8CZpZu8JdlRSCO7K8S2p92+NVLw scqNc5rQeMLfEjOIV8pNks7xBa81qvG5p5D0Yc9SCZlYN+NVQsrfkljvbpZJL4E+4s3j l6PQ== X-Received: by 10.205.15.136 with SMTP id pu8mr4923960bkb.133.1363022137926; Mon, 11 Mar 2013 10:15:37 -0700 (PDT) Received: from [192.168.1.102] (c-71-234-225-85.hsd1.ct.comcast.net. [71.234.225.85]) by mx.google.com with ESMTPS id g28sm4364980bkv.17.2013.03.11.10.15.35 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 11 Mar 2013 10:15:37 -0700 (PDT) Message-ID: <513E1136.2010604@dev.mellanox.co.il> Date: Mon, 11 Mar 2013 13:15:34 -0400 From: Hal Rosenstock User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:9.0) Gecko/20111222 Thunderbird/9.0.1 MIME-Version: 1.0 To: "linux-rdma (linux-rdma@vger.kernel.org)" Subject: [PATCH] libibumad: Rename attributes UMAD_SM_ATTR_XYZ rather than UMAD_SMP_ATTR_XYZ X-Gm-Message-State: ALoCoQlQdniM8FeJG2ZReoWU9caKDIrSu16ClT0wWhA26DvKal74C1ZyyF4GGlwD7bjlyCUbnsEr Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org 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/infiniband/umad_sm.h b/include/infiniband/umad_sm.h index bd6833b..0ef3863 100644 --- a/include/infiniband/umad_sm.h +++ b/include/infiniband/umad_sm.h @@ -55,25 +55,25 @@ enum { /* Subnet management attributes */ enum { - UMAD_SMP_ATTR_NODE_DESC = 0x0010, - UMAD_SMP_ATTR_NODE_INFO = 0x0011, - UMAD_SMP_ATTR_SWITCH_INFO = 0x0012, - UMAD_SMP_ATTR_GUID_INFO = 0x0014, - UMAD_SMP_ATTR_PORT_INFO = 0x0015, - UMAD_SMP_ATTR_PKEY_TABLE = 0x0016, - UMAD_SMP_ATTR_SLVL_TABLE = 0x0017, - UMAD_SMP_ATTR_VL_ARB_TABLE = 0x0018, - UMAD_SMP_ATTR_LINEAR_FT = 0x0019, - UMAD_SMP_ATTR_RANDOM_FT = 0x001A, - UMAD_SMP_ATTR_MCAST_FT = 0x001B, - UMAD_SMP_ATTR_LINK_SPD_WIDTH_TABLE = 0x001C, - UMAD_SMP_ATTR_VENDOR_MADS_TABLE = 0x001D, - UMAD_SMP_ATTR_HIERARCHY_INFO = 0x001E, - UMAD_SMP_ATTR_SM_INFO = 0x0020, - UMAD_SMP_ATTR_VENDOR_DIAG = 0x0030, - UMAD_SMP_ATTR_LED_INFO = 0x0031, - UMAD_SMP_ATTR_CABLE_INFO = 0x0032, - UMAD_SMP_ATTR_VENDOR_MASK = 0xFF00 + UMAD_SM_ATTR_NODE_DESC = 0x0010, + UMAD_SM_ATTR_NODE_INFO = 0x0011, + UMAD_SM_ATTR_SWITCH_INFO = 0x0012, + UMAD_SM_ATTR_GUID_INFO = 0x0014, + UMAD_SM_ATTR_PORT_INFO = 0x0015, + UMAD_SM_ATTR_PKEY_TABLE = 0x0016, + UMAD_SM_ATTR_SLVL_TABLE = 0x0017, + UMAD_SM_ATTR_VL_ARB_TABLE = 0x0018, + UMAD_SM_ATTR_LINEAR_FT = 0x0019, + UMAD_SM_ATTR_RANDOM_FT = 0x001A, + UMAD_SM_ATTR_MCAST_FT = 0x001B, + UMAD_SM_ATTR_LINK_SPD_WIDTH_TABLE = 0x001C, + UMAD_SM_ATTR_VENDOR_MADS_TABLE = 0x001D, + UMAD_SM_ATTR_HIERARCHY_INFO = 0x001E, + UMAD_SM_ATTR_SM_INFO = 0x0020, + UMAD_SM_ATTR_VENDOR_DIAG = 0x0030, + UMAD_SM_ATTR_LED_INFO = 0x0031, + UMAD_SM_ATTR_CABLE_INFO = 0x0032, + UMAD_SM_ATTR_VENDOR_MASK = 0xFF00 }; enum { diff --git a/src/umad_str.c b/src/umad_str.c index a04b35b..0a000f3 100644 --- a/src/umad_str.c +++ b/src/umad_str.c @@ -203,41 +203,41 @@ static const char *umad_common_attr_str(be16_t attr_id) static const char * umad_sm_attr_str(be16_t attr_id) { switch(ntohs(attr_id)) { - case UMAD_SMP_ATTR_NODE_DESC: + case UMAD_SM_ATTR_NODE_DESC: return ("NodeDescription"); - case UMAD_SMP_ATTR_NODE_INFO: + case UMAD_SM_ATTR_NODE_INFO: return ("NodeInfo"); - case UMAD_SMP_ATTR_SWITCH_INFO: + case UMAD_SM_ATTR_SWITCH_INFO: return ("SwitchInfo"); - case UMAD_SMP_ATTR_GUID_INFO: + case UMAD_SM_ATTR_GUID_INFO: return ("GUIDInfo"); - case UMAD_SMP_ATTR_PORT_INFO: + case UMAD_SM_ATTR_PORT_INFO: return ("PortInfo"); - case UMAD_SMP_ATTR_PKEY_TABLE: + case UMAD_SM_ATTR_PKEY_TABLE: return ("P_KeyTable"); - case UMAD_SMP_ATTR_SLVL_TABLE: + case UMAD_SM_ATTR_SLVL_TABLE: return ("SLtoVLMappingTable"); - case UMAD_SMP_ATTR_VL_ARB_TABLE: + case UMAD_SM_ATTR_VL_ARB_TABLE: return ("VLArbitrationTable"); - case UMAD_SMP_ATTR_LINEAR_FT: + case UMAD_SM_ATTR_LINEAR_FT: return ("LinearForwardingTable"); - case UMAD_SMP_ATTR_RANDOM_FT: + case UMAD_SM_ATTR_RANDOM_FT: return ("RandomForwardingTable"); - case UMAD_SMP_ATTR_MCAST_FT: + case UMAD_SM_ATTR_MCAST_FT: return ("MulticastForwardingTable"); - case UMAD_SMP_ATTR_SM_INFO: + case UMAD_SM_ATTR_SM_INFO: return ("SMInfo"); - case UMAD_SMP_ATTR_VENDOR_DIAG: + case UMAD_SM_ATTR_VENDOR_DIAG: return ("VendorDiag"); - case UMAD_SMP_ATTR_LED_INFO: + case UMAD_SM_ATTR_LED_INFO: return ("LedInfo"); - case UMAD_SMP_ATTR_LINK_SPD_WIDTH_TABLE: + case UMAD_SM_ATTR_LINK_SPD_WIDTH_TABLE: return ("LinkSpeedWidthPairsTable"); - case UMAD_SMP_ATTR_VENDOR_MADS_TABLE: + case UMAD_SM_ATTR_VENDOR_MADS_TABLE: return ("VendorSpecificMadsTable"); - case UMAD_SMP_ATTR_HIERARCHY_INFO: + case UMAD_SM_ATTR_HIERARCHY_INFO: return ("HierarchyInfo"); - case UMAD_SMP_ATTR_CABLE_INFO: + case UMAD_SM_ATTR_CABLE_INFO: return ("CableInfo"); default: return (umad_common_attr_str(attr_id));