From patchwork Fri Apr 29 13:27:19 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Rosenstock X-Patchwork-Id: 740981 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 p3TDQl4R010898 for ; Fri, 29 Apr 2011 13:27:28 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758688Ab1D2N12 (ORCPT ); Fri, 29 Apr 2011 09:27:28 -0400 Received: from mail-wy0-f174.google.com ([74.125.82.174]:62837 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752114Ab1D2N11 (ORCPT ); Fri, 29 Apr 2011 09:27:27 -0400 Received: by mail-wy0-f174.google.com with SMTP id 21so2840843wya.19 for ; Fri, 29 Apr 2011 06:27:23 -0700 (PDT) Received: by 10.216.143.96 with SMTP id k74mr624462wej.100.1304083643430; Fri, 29 Apr 2011 06:27:23 -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 w12sm66751wby.24.2011.04.29.06.27.21 (version=SSLv3 cipher=OTHER); Fri, 29 Apr 2011 06:27:22 -0700 (PDT) Message-ID: <4DBABCB7.3060000@dev.mellanox.co.il> Date: Fri, 29 Apr 2011 09:27:19 -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 4/13] opensm/osm_sa_guidinfo_record.c: Use OSM_VENDOR_ID_OPENIB define 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]); Fri, 29 Apr 2011 13:27:28 +0000 (UTC) From a8183ead5fbfe2dc8424967f6c7d9eef4aa4bdf9 Mon Sep 17 00:00:00 2001 From: Hal Rosenstock Date: Thu, 28 Apr 2011 23:29:55 +0300 Subject: [PATCH] opensm/osm_sa_guidinfo_record.c: Use OSM_VENDOR_ID_OPENIB define rather than IB_OPENIB_OUI Signed-off-by: Hal Rosenstock --- opensm/osm_sa_guidinfo_record.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/opensm/osm_sa_guidinfo_record.c b/opensm/osm_sa_guidinfo_record.c index 79e9c51..c4b7d3d 100644 --- a/opensm/osm_sa_guidinfo_record.c +++ b/opensm/osm_sa_guidinfo_record.c @@ -57,7 +57,6 @@ #include #include -#define IB_OPENIB_OUI 0x001405 #define MOD_GIR_COMP_MASK (IB_GIR_COMPMASK_LID | IB_GIR_COMPMASK_BLOCKNUM) typedef struct osm_gir_item { @@ -366,7 +365,7 @@ static ib_net64_t sm_assigned_guid(uint8_t assigned_byte) } return cl_hton64(((uint64_t) uniq_count) | (((uint64_t) assigned_byte) << 32) | - (((uint64_t) IB_OPENIB_OUI) << 40)); + (((uint64_t) OSM_VENDOR_ID_OPENIB) << 40)); } static void guidinfo_set(IN osm_sa_t *sa, IN osm_port_t *p_port,