From patchwork Mon May 13 16:30:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Line Holen X-Patchwork-Id: 2559401 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 9D4743FC5A for ; Mon, 13 May 2013 16:30:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751640Ab3EMQa5 (ORCPT ); Mon, 13 May 2013 12:30:57 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:20998 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752590Ab3EMQa4 convert rfc822-to-8bit (ORCPT ); Mon, 13 May 2013 12:30:56 -0400 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by aserp1040.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id r4DGUiv2027309 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 13 May 2013 16:30:45 GMT Received: from aserz7022.oracle.com (aserz7022.oracle.com [141.146.126.231]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r4DGUhhM023242 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Mon, 13 May 2013 16:30:44 GMT Received: from abhmt110.oracle.com (abhmt110.oracle.com [141.146.116.62]) by aserz7022.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r4DGUhBf023235; Mon, 13 May 2013 16:30:43 GMT MIME-Version: 1.0 Message-ID: <3127e9af-32d6-4b07-9468-6c9d950e5c0d@default> Date: Mon, 13 May 2013 09:30:43 -0700 (PDT) From: Line Holen To: Cc: Subject: [PATCH] osm_sa_multipath_record.c Use aliasGUIDs when building responses X-Mailer: Zimbra on Oracle Beehive Content-Disposition: inline X-Source-IP: acsinet22.oracle.com [141.146.126.238] Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org This patch makes multipath responses use the GUIDs supplied in the request when filling in response packets. Previously it could replace a aliasGUID with the baseGUID (portGUID) of the port. This change makes multipath record handling consistent with path record handling. Signed-off-by: Line Holen --- -- 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_multipath_record.c b/opensm/osm_sa_multipath_record.c index b4fc30f..bde993c 100644 --- a/opensm/osm_sa_multipath_record.c +++ b/opensm/osm_sa_multipath_record.c @@ -2,6 +2,7 @@ * Copyright (c) 2006-2009 Voltaire, Inc. All rights reserved. * Copyright (c) 2002-2011 Mellanox Technologies LTD. All rights reserved. * Copyright (c) 1996-2003 Intel Corporation. All rights reserved. + * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved. * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU @@ -841,10 +842,10 @@ static void mpr_rcv_build_pr(IN osm_sa_t * sa, p_dest_physp = p_dest_alias_guid->p_base_port->p_physp; p_pr->dgid.unicast.prefix = osm_physp_get_subnet_prefix(p_dest_physp); - p_pr->dgid.unicast.interface_id = osm_physp_get_port_guid(p_dest_physp); + p_pr->dgid.unicast.interface_id = p_dest_alias_guid->alias_guid; p_pr->sgid.unicast.prefix = osm_physp_get_subnet_prefix(p_src_physp); - p_pr->sgid.unicast.interface_id = osm_physp_get_port_guid(p_src_physp); + p_pr->sgid.unicast.interface_id = p_src_alias_guid->alias_guid; p_pr->dlid = cl_hton16(dest_lid_ho); p_pr->slid = cl_hton16(src_lid_ho);