From patchwork Fri Feb 18 21:29:19 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Heinz X-Patchwork-Id: 574081 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 p1ILTHkc014324 for ; Fri, 18 Feb 2011 21:29:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753233Ab1BRV3W (ORCPT ); Fri, 18 Feb 2011 16:29:22 -0500 Received: from [198.186.4.11] ([198.186.4.11]:8265 "EHLO homer.dev.silverstorm.com" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1753008Ab1BRV3V (ORCPT ); Fri, 18 Feb 2011 16:29:21 -0500 Received: from [172.21.1.208] (homer [127.0.0.1]) by homer.dev.silverstorm.com (8.13.8/8.13.8) with ESMTP id p1ILTJYK021422; Fri, 18 Feb 2011 16:29:19 -0500 Subject: [PATCH 2/2] Add support for ib_build_node_desc() to the HCAs. To: roland@kernel.org, linux-rdma@vger.kernel.org, michael.heinz@qlogic.com From: Michael Heinz Date: Fri, 18 Feb 2011 16:29:19 -0500 Message-ID: <20110218212919.21364.6992.stgit@homer> In-Reply-To: <20110218212723.21364.92709.stgit@homer> References: <20110218212723.21364.92709.stgit@homer> User-Agent: StGit/0.15 MIME-Version: 1.0 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.6 (demeter1.kernel.org [140.211.167.41]); Fri, 18 Feb 2011 21:29:22 +0000 (UTC) diff --git a/drivers/infiniband/hw/ipath/ipath_mad.c b/drivers/infiniband/hw/ipath/ipath_mad.c index ceb98ee..bd1a112 100644 --- a/drivers/infiniband/hw/ipath/ipath_mad.c +++ b/drivers/infiniband/hw/ipath/ipath_mad.c @@ -60,7 +60,7 @@ static int recv_subn_get_nodedescription(struct ib_smp *smp, if (smp->attr_mod) smp->status |= IB_SMP_INVALID_FIELD; - memcpy(smp->data, ibdev->node_desc, sizeof(smp->data)); + ib_build_node_desc(smp, ibdev->node_desc); return reply(smp); } diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c index 57ffa50..6a89c3c 100644 --- a/drivers/infiniband/hw/mlx4/mad.c +++ b/drivers/infiniband/hw/mlx4/mad.c @@ -196,7 +196,7 @@ static void node_desc_override(struct ib_device *dev, mad->mad_hdr.method == IB_MGMT_METHOD_GET_RESP && mad->mad_hdr.attr_id == IB_SMP_ATTR_NODE_DESC) { spin_lock(&to_mdev(dev)->sm_lock); - memcpy(((struct ib_smp *) mad)->data, dev->node_desc, 64); + ib_build_node_desc((struct ib_smp *) mad, dev->node_desc); spin_unlock(&to_mdev(dev)->sm_lock); } } diff --git a/drivers/infiniband/hw/mthca/mthca_mad.c b/drivers/infiniband/hw/mthca/mthca_mad.c index 03a5953..b442028 100644 --- a/drivers/infiniband/hw/mthca/mthca_mad.c +++ b/drivers/infiniband/hw/mthca/mthca_mad.c @@ -153,7 +153,7 @@ static void node_desc_override(struct ib_device *dev, mad->mad_hdr.method == IB_MGMT_METHOD_GET_RESP && mad->mad_hdr.attr_id == IB_SMP_ATTR_NODE_DESC) { mutex_lock(&to_mdev(dev)->cap_mask_mutex); - memcpy(((struct ib_smp *) mad)->data, dev->node_desc, 64); + ib_build_node_desc((struct ib_smp *) mad, dev->node_desc); mutex_unlock(&to_mdev(dev)->cap_mask_mutex); } } diff --git a/drivers/infiniband/hw/qib/qib_mad.c b/drivers/infiniband/hw/qib/qib_mad.c index 5ad224e..1033112 100644 --- a/drivers/infiniband/hw/qib/qib_mad.c +++ b/drivers/infiniband/hw/qib/qib_mad.c @@ -260,7 +260,7 @@ static int subn_get_nodedescription(struct ib_smp *smp, if (smp->attr_mod) smp->status |= IB_SMP_INVALID_FIELD; - memcpy(smp->data, ibdev->node_desc, sizeof(smp->data)); + ib_build_node_desc(smp, ibdev->node_desc); return reply(smp); }