From patchwork Wed Nov 3 14:37:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksey Senin X-Patchwork-Id: 298972 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 oA3EZtCQ021729 for ; Wed, 3 Nov 2010 14:38:02 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755353Ab0KCOiB (ORCPT ); Wed, 3 Nov 2010 10:38:01 -0400 Received: from fwil.voltaire.com ([193.47.165.2]:59266 "EHLO exil.voltaire.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755295Ab0KCOiB (ORCPT ); Wed, 3 Nov 2010 10:38:01 -0400 Received: from [172.25.5.190] ([172.25.5.190]) by exil.voltaire.com with Microsoft SMTPSVC(6.0.3790.4675); Wed, 3 Nov 2010 16:37:59 +0200 Message-ID: <4CD173C7.4050707@voltaire.com> Date: Wed, 03 Nov 2010 16:37:59 +0200 From: Aleksey Senin User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); en-US; rv:1.9.1.11) Gecko/20100711 Thunderbird/3.0.6 MIME-Version: 1.0 To: linux-rdma@vger.kernel.org CC: Roland Dreier , Moni Shoua , Alex Rosenbaum Subject: [PATCH V2 3/3] Add RAW_PACKET to ib_attach/detach mcast calls References: <4CD171F0.8020506@voltaire.com> <4CD172C8.4010700@voltaire.com> <4CD17345.7040400@voltaire.com> In-Reply-To: <4CD17345.7040400@voltaire.com> X-OriginalArrivalTime: 03 Nov 2010 14:37:59.0459 (UTC) FILETIME=[B63D0730:01CB7B64] 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]); Wed, 03 Nov 2010 14:38:02 +0000 (UTC) diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c index b04b419..a053c0e 100644 --- a/drivers/infiniband/core/verbs.c +++ b/drivers/infiniband/core/verbs.c @@ -903,9 +903,17 @@ int ib_attach_mcast(struct ib_qp *qp, union ib_gid *gid, u16 lid) { if (!qp->device->attach_mcast) return -ENOSYS; - if (gid->raw[0] != 0xff || qp->qp_type != IB_QPT_UD) - return -EINVAL; + switch (rdma_node_get_transport(qp->device->node_type)) { + case RDMA_TRANSPORT_IB: + if (gid->raw[0] != 0xff || qp->qp_type != IB_QPT_UD) + return -EINVAL; + break; + case RDMA_TRANSPORT_IWARP: + if (qp->qp_type != IB_QPT_RAW_PACKET) + return -EINVAL; + break; + } return qp->device->attach_mcast(qp, gid, lid); } EXPORT_SYMBOL(ib_attach_mcast); @@ -914,9 +922,17 @@ int ib_detach_mcast(struct ib_qp *qp, union ib_gid *gid, u16 lid) { if (!qp->device->detach_mcast) return -ENOSYS; - if (gid->raw[0] != 0xff || qp->qp_type != IB_QPT_UD) - return -EINVAL; + switch (rdma_node_get_transport(qp->device->node_type)) { + case RDMA_TRANSPORT_IB: + if (gid->raw[0] != 0xff || qp->qp_type != IB_QPT_UD) + return -EINVAL; + break; + case RDMA_TRANSPORT_IWARP: + if (qp->qp_type != IB_QPT_RAW_PACKET) + return -EINVAL; + break; + } return qp->device->detach_mcast(qp, gid, lid); } EXPORT_SYMBOL(ib_detach_mcast);