From: Ira Weiny <ira.weiny@xxxxxxxxx> Change the default node description string to IB_DEFAULT_ND_FORMAT Use ib_build_node_desc to dynamically map this string when queried Reviewed-by: John Fleck <john.fleck@xxxxxxxxx> Reviewed-by: Michael Heinz <michael.william.heinz@xxxxxxxxx> Reviewed-by: Mike Marciniszyn <mike.marciniszyn@xxxxxxxxx> Signed-off-by: Ira Weiny <ira.weiny@xxxxxxxxx> --- drivers/infiniband/hw/ipath/ipath_mad.c | 3 ++- drivers/infiniband/hw/ipath/ipath_verbs.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/infiniband/hw/ipath/ipath_mad.c b/drivers/infiniband/hw/ipath/ipath_mad.c index e890e5b..1ec0afd 100644 --- a/drivers/infiniband/hw/ipath/ipath_mad.c +++ b/drivers/infiniband/hw/ipath/ipath_mad.c @@ -61,7 +61,8 @@ 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->data, ibdev->node_desc, IB_DEVICE_DESC_MAX, + ibdev); return reply(smp); } diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.c b/drivers/infiniband/hw/ipath/ipath_verbs.c index 44ea939..bec61d6 100644 --- a/drivers/infiniband/hw/ipath/ipath_verbs.c +++ b/drivers/infiniband/hw/ipath/ipath_verbs.c @@ -2180,8 +2180,8 @@ int ipath_register_ib_device(struct ipath_devdata *dd) dev->mmap = ipath_mmap; dev->dma_ops = &ipath_dma_mapping_ops; - snprintf(dev->node_desc, sizeof(dev->node_desc), - IPATH_IDSTR " %s", init_utsname()->nodename); + snprintf(dev->node_desc, sizeof(dev->node_desc)-1, "%s", + IB_DEFAULT_ND_FORMAT); ret = ib_register_device(dev, NULL); if (ret) -- 1.8.2 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
