From patchwork Fri Jan 25 13:07: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: 2044911 X-Patchwork-Delegate: alexne@voltaire.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 CA6403FD1A for ; Fri, 25 Jan 2013 13:06:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932151Ab3AYNGq (ORCPT ); Fri, 25 Jan 2013 08:06:46 -0500 Received: from mail-qc0-f173.google.com ([209.85.216.173]:55152 "EHLO mail-qc0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932101Ab3AYNGp (ORCPT ); Fri, 25 Jan 2013 08:06:45 -0500 Received: by mail-qc0-f173.google.com with SMTP id b12so157238qca.4 for ; Fri, 25 Jan 2013 05:06:44 -0800 (PST) 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:cc :subject:content-type:content-transfer-encoding:x-gm-message-state; bh=t5oTXs9Ze3NYD+3MNHovuOrhAB9fibvNw154V2tUPCc=; b=YX/hu1upi86ikTzFcqlFYE1RFqbTSVn5PVN+USsnnWIeMnbD0BWYyWAv14MFmMTsTC t5SQnUnMAo93gQX5FhUdLAGkHoVBss7TLX+wVf/JywiFfSVjTbh4KFu8SwKtHS8uyHeA +TV22SRtEgh8/kRQcg1GlIrnDXDFOMYrDFlyB9gR3eO6FdrzshFeewu9zJIUR1uCs2O2 I3/6IwLe1MDFxjn7Zt8+SPIWacIoLqnFV5AuDgNYujiO8bdVhZR2uIf1gAGYv2ow6tt5 DjKMn8PJ6j7+8o1vrkT2tKfwxdDLJdHfcCCuX4GxWvP1AGZEEiJX6y7n1zJXxvX4dZIH Kjdg== X-Received: by 10.224.177.81 with SMTP id bh17mr5734216qab.26.1359119204533; Fri, 25 Jan 2013 05:06:44 -0800 (PST) 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 i15sm485392qah.21.2013.01.25.05.06.42 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 25 Jan 2013 05:06:43 -0800 (PST) Message-ID: <51028396.6030902@dev.mellanox.co.il> Date: Fri, 25 Jan 2013 08:07:34 -0500 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: Alex Netes CC: "linux-rdma (linux-rdma@vger.kernel.org)" Subject: [PATCH v2] opensm/osm_sa_mcmember_record.c: Only use scope from MC group in copy_from_create_mc_rec X-Gm-Message-State: ALoCoQkorl9My3YF0TaATgb6bVcmaGai/6jTJ8iVdAtOLgGsJlWTsQycQP6oSebPQnS7HHTBzYEn Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org Fix osmtest -f m regression introduced by commit 2cf80781aa91da7d119a6486d01a0656980fee8a Signed-off-by: Hal Rosenstock --- Change since v1: Added more description as to motivation for this change -- 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/opensm/osm_sa_mcmember_record.c b/opensm/osm_sa_mcmember_record.c index 96c1139..8099358 100644 --- a/opensm/osm_sa_mcmember_record.c +++ b/opensm/osm_sa_mcmember_record.c @@ -97,7 +97,8 @@ static void copy_from_create_mc_rec(IN ib_member_rec_t * dest, dest->tclass = src->tclass; dest->pkey = src->pkey; dest->sl_flow_hop = src->sl_flow_hop; - dest->scope_state = src->scope_state; + dest->scope_state = ib_member_set_scope_state(src->scope_state >> 4, + dest->scope_state & 0x0F); dest->mtu = src->mtu; dest->rate = src->rate; dest->pkt_life = src->pkt_life;