From patchwork Wed Aug 1 15:29:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Rosenstock X-Patchwork-Id: 1264691 X-Patchwork-Delegate: alexne@voltaire.com Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id D25ECDF215 for ; Wed, 1 Aug 2012 15:29:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753475Ab2HAP3T (ORCPT ); Wed, 1 Aug 2012 11:29:19 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:51051 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752729Ab2HAP3S (ORCPT ); Wed, 1 Aug 2012 11:29:18 -0400 Received: by eaac11 with SMTP id c11so573894eaa.19 for ; Wed, 01 Aug 2012 08:29:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding:x-gm-message-state; bh=fdC1ARfuhR4t/vkkzEOWWbg0z+QfSDyUn/dWkyDGw8A=; b=kfhOBb1VecUBvQECyqz2LRWJPl3w4kjcfUHnysvdbIzmeG7Bs8KOtEIEKjYs4EPW+E fn72OACegRkFnXuvUPaHVD+bit2QZNbysNXouiY/Ut0AVuEpJ3+o4GXvoQGUxpn469R8 jOZgu7iGiO8dTAQjOMlVHYTFcM/3D/5lcJ6hKByLZOx4yB2CXtv6ee/W+1n0xmvLBnza 4cZKF1kjFc1kmj1d/KsIyyaomLFHRwDGh+YuHFNN0DueXV1EchrfXmX88kgRq3LIvjH0 ChFqJXiCrvcCvlsg5cPQpkp3Bv6L7LBwbTH2fH4XdSHd6861sj1UW+6AUS9gBX9GNxOd dEGw== Received: by 10.14.178.7 with SMTP id e7mr22824778eem.20.1343834956895; Wed, 01 Aug 2012 08:29:16 -0700 (PDT) Received: from [172.25.5.27] ([193.47.165.251]) by mx.google.com with ESMTPS id w5sm9848078eeo.1.2012.08.01.08.29.14 (version=SSLv3 cipher=OTHER); Wed, 01 Aug 2012 08:29:15 -0700 (PDT) Message-ID: <50194B48.30105@dev.mellanox.co.il> Date: Wed, 01 Aug 2012 11:29:12 -0400 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 3/2] opensm: Add support for multicast service records X-Gm-Message-State: ALoCoQnoVqd+BxZdDVHtHaPC/ZP8ivhM2YrrT2+LiZ/LDV3WQzwnRMtvs5F711ztx8Io+9PB/Uoo Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org Per MgtWG RefIDs #4735 and #4737 Signed-off-by: Hal Rosenstock --- -- 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_class_port_info.c b/opensm/osm_sa_class_port_info.c index 31271b3..2682505 100644 --- a/opensm/osm_sa_class_port_info.c +++ b/opensm/osm_sa_class_port_info.c @@ -162,6 +162,7 @@ static void cpi_rcv_respond(IN osm_sa_t * sa, IN const osm_madw_t * p_madw) cap_mask2 = OSM_CAP2_IS_FULL_PORTINFO_REC_SUPPORTED | OSM_CAP2_IS_EXTENDED_SPEEDS_SUPPORTED | OSM_CAP2_IS_ALIAS_GUIDS_SUPPORTED | + OSM_CAP2_IS_MULTICAST_SERVICE_RECS_SUPPORTED | OSM_CAP2_IS_PORT_INFO_CAPMASK2_MATCH_SUPPORTED; if (sa->p_subn->opt.use_mfttop) cap_mask2 |= OSM_CAP2_IS_MCAST_TOP_SUPPORTED; diff --git a/opensm/osm_sa_service_record.c b/opensm/osm_sa_service_record.c index b274878..b238f94 100644 --- a/opensm/osm_sa_service_record.c +++ b/opensm/osm_sa_service_record.c @@ -110,8 +110,9 @@ match_service_pkey_with_ports_pkey(IN osm_sa_t * sa, goto Exit; } - /* Make sure it matches the port of the ServiceGid */ - if (comp_mask & IB_SR_COMPMASK_SGID) { + /* If unicast, make sure it matches the port of the ServiceGid */ + if (comp_mask & IB_SR_COMPMASK_SGID && + !ib_gid_is_multicast(&p_service_rec->service_gid)) { service_guid = p_service_rec->service_gid.unicast.interface_id; service_port =