From patchwork Sun Nov 1 22:38:19 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yevgeny Kliteynik X-Patchwork-Id: 56915 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nA1MXfHP016944 for ; Sun, 1 Nov 2009 22:33:42 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753428AbZKAWdd (ORCPT ); Sun, 1 Nov 2009 17:33:33 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753543AbZKAWdd (ORCPT ); Sun, 1 Nov 2009 17:33:33 -0500 Received: from mail.mellanox.co.il ([194.90.237.43]:34405 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753428AbZKAWdd (ORCPT ); Sun, 1 Nov 2009 17:33:33 -0500 Received: from Internal Mail-Server by MTLPINE1 (envelope-from kliteyn@dev.mellanox.co.il) with SMTP; 2 Nov 2009 00:38:58 +0200 Received: from [10.4.1.29] ([10.4.1.29]) by mtlexch01.mtl.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 2 Nov 2009 00:33:33 +0200 Message-ID: <4AEE0DDB.3050606@dev.mellanox.co.il> Date: Mon, 02 Nov 2009 00:38:19 +0200 From: Yevgeny Kliteynik Reply-To: kliteyn@dev.mellanox.co.il User-Agent: Thunderbird 1.5.0.5 (X11/20060719) MIME-Version: 1.0 To: Sasha Khapyorsky CC: Linux RDMA Subject: [PATCH] opensm/osm_sa_mcmember_record.c: fsmall code optimization X-OriginalArrivalTime: 01 Nov 2009 22:33:33.0158 (UTC) FILETIME=[580BB860:01CA5B43] Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org diff --git a/opensm/opensm/osm_sa_mcmember_record.c b/opensm/opensm/osm_sa_mcmember_record.c index 18dc22c..4ae6be6 100644 --- a/opensm/opensm/osm_sa_mcmember_record.c +++ b/opensm/opensm/osm_sa_mcmember_record.c @@ -731,7 +731,6 @@ static ib_api_status_t mcmr_rcv_create_new_mgrp(IN osm_sa_t * sa, OUT osm_mgrp_t ** pp_mgrp) { ib_net16_t mlid; - unsigned zero_mgid = 1; uint8_t scope; ib_gid_t *p_mgid; ib_api_status_t status = IB_SUCCESS; @@ -739,11 +738,6 @@ static ib_api_status_t mcmr_rcv_create_new_mgrp(IN osm_sa_t * sa, OSM_LOG_ENTER(sa->p_log); - /* but what if the given MGID was not 0 ? */ - if (p_recvd_mcmember_rec->mgid.unicast.prefix != 0 || - p_recvd_mcmember_rec->mgid.unicast.interface_id != 0) - zero_mgid = 0; - /* we allocate a new mlid number before we might use it for MGID ... @@ -761,7 +755,7 @@ static ib_api_status_t mcmr_rcv_create_new_mgrp(IN osm_sa_t * sa, "Obtained new mlid 0x%X\n", cl_ntoh16(mlid)); /* we need to create the new MGID if it was not defined */ - if (zero_mgid) { + if (!ib_gid_is_notzero(&p_recvd_mcmember_rec->mgid)) { /* create a new MGID */ char gid_str[INET6_ADDRSTRLEN];