From patchwork Tue Sep 7 14:50:33 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yevgeny Kliteynik X-Patchwork-Id: 161001 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 o87EpD6B031105 for ; Tue, 7 Sep 2010 14:51:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757178Ab0IGOux (ORCPT ); Tue, 7 Sep 2010 10:50:53 -0400 Received: from mail.mellanox.co.il ([194.90.237.43]:53339 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1757093Ab0IGOux (ORCPT ); Tue, 7 Sep 2010 10:50:53 -0400 Received: from Internal Mail-Server by MTLPINE2 (envelope-from kliteyn@mellanox.co.il) with SMTP; 7 Sep 2010 17:50:10 +0300 Received: from [10.4.1.29] (10.4.1.29) by mtlmail01.mtl.com (10.0.8.12) with Microsoft SMTP Server id 8.2.254.0; Tue, 7 Sep 2010 17:50:48 +0300 Message-ID: <4C865139.7010705@mellanox.co.il> Date: Tue, 7 Sep 2010 17:50:33 +0300 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_prtn.c: removing TopSpin hack 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 (demeter1.kernel.org [140.211.167.41]); Tue, 07 Sep 2010 14:51:13 +0000 (UTC) diff --git a/opensm/opensm/osm_prtn.c b/opensm/opensm/osm_prtn.c index f953876..4b087a4 100644 --- a/opensm/opensm/osm_prtn.c +++ b/opensm/opensm/osm_prtn.c @@ -167,21 +167,6 @@ static const ib_gid_t osm_ipoib_mgid = { }, }; -/* - * HACK: Until TS resolves their noncompliant join compmask, - * we have to pre-define the MGID - */ -static const ib_gid_t osm_ts_ipoib_mgid = { - { - 0xff, /* multicast field */ - 0x12, /* non-permanent bit, link local scope */ - 0x40, 0x1b, /* IPv4 signature */ - 0xff, 0xff, /* 16 bits of P_Key (to be filled in) */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 48 bits of zeros */ - 0x00, 0x00, 0x00, 0x01, /* 32 bit IPv4 broadcast address */ - }, -}; - ib_api_status_t osm_prtn_add_mcgroup(osm_log_t * p_log, osm_subn_t * p_subn, osm_prtn_t * p, uint8_t rate, uint8_t mtu, uint8_t scope) @@ -229,22 +214,6 @@ ib_api_status_t osm_prtn_add_mcgroup(osm_log_t * p_log, osm_subn_t * p_subn, p->mgrp = p_mgrp; } - /* workaround for TS */ - /* FIXME: remove this upon TS fixes */ - mc_rec.mgid = osm_ts_ipoib_mgid; - memcpy(&mc_rec.mgid.raw[4], &pkey, sizeof(pkey)); - /* Scope in MCMemberRecord (if present) needs to be consistent with MGID */ - mc_rec.scope_state = ib_member_set_scope_state(scope, IB_MC_REC_STATE_FULL_MEMBER); - ib_mgid_set_scope(&mc_rec.mgid, scope); - - status = osm_mcmr_rcv_find_or_create_new_mgrp(p_sa, comp_mask, &mc_rec, - &p_mgrp); - if (p_mgrp) { - p_mgrp->well_known = TRUE; - if (!p->mgrp) - p->mgrp = p_mgrp; - } - return status; }