[PATCH 2/2] Improved node descriptions
From: Michael Heinz <hidden>
Date: 2011-02-17 21:31:08
Subsystem:
infiniband subsystem, mellanox mlx4 ib driver, the rest · Maintainers:
Jason Gunthorpe, Leon Romanovsky, Yishai Hadas, Linus Torvalds
Adds support for ib_build_node_desc() to the HCAs. Signed-off-by: Michael Heinz <redacted> --- drivers/infiniband/hw/ipath/ipath_mad.c | 2 +- drivers/infiniband/hw/mlx4/mad.c | 3 ++- drivers/infiniband/hw/mthca/mthca_mad.c | 3 ++- drivers/infiniband/hw/qib/qib_mad.c | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/infiniband/hw/ipath/ipath_mad.c b/drivers/infiniband/hw/ipath/ipath_mad.c
index ceb98ee..6da4750 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((char *)smp->data, ibdev->node_desc); return reply(smp); }
diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
index 57ffa50..6b35d49 100644
--- a/drivers/infiniband/hw/mlx4/mad.c
+++ b/drivers/infiniband/hw/mlx4/mad.c@@ -196,7 +196,8 @@ 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((char *)((struct ib_smp *) mad)->data, + 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..7662097 100644
--- a/drivers/infiniband/hw/mthca/mthca_mad.c
+++ b/drivers/infiniband/hw/mthca/mthca_mad.c@@ -153,7 +153,8 @@ 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((char *)((struct ib_smp *) mad)->data, + 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..59d7cbb 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((char *)smp->data, ibdev->node_desc); return reply(smp); } --
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html