IB/{core,hw}: Add constant for node_desc

Signed-off-by: Yuval Shaia <yuval.shaia@oracle.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

2 files changed, 5 insertions, 4 deletions

diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
index 9b4b21bd0222..d8886d051d4b 100644
--- a/drivers/infiniband/hw/mlx4/mad.c
+++ b/drivers/infiniband/hw/mlx4/mad.c
@@ -345,7 +345,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_irqsave(&to_mdev(dev)->sm_lock, flags);
-                memcpy(((struct ib_smp *) mad)->data, dev->node_desc, 64);
+                memcpy(((struct ib_smp *) mad)->data, dev->node_desc,
+                       IB_DEVICE_NODE_DESC_MAX);
                 spin_unlock_irqrestore(&to_mdev(dev)->sm_lock, flags);
         }
 }
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index f07cbf87db52..3ae64cefc39e 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -886,7 +886,7 @@ static int mlx4_ib_modify_device(struct ib_device *ibdev, int mask,
                 return -EOPNOTSUPP;
 
         spin_lock_irqsave(&to_mdev(ibdev)->sm_lock, flags);
-        memcpy(ibdev->node_desc, props->node_desc, 64);
+        memcpy(ibdev->node_desc, props->node_desc, IB_DEVICE_NODE_DESC_MAX);
         spin_unlock_irqrestore(&to_mdev(ibdev)->sm_lock, flags);
 
         /*
@@ -897,7 +897,7 @@ static int mlx4_ib_modify_device(struct ib_device *ibdev, int mask,
         if (IS_ERR(mailbox))
                 return 0;
 
-        memcpy(mailbox->buf, props->node_desc, 64);
+        memcpy(mailbox->buf, props->node_desc, IB_DEVICE_NODE_DESC_MAX);
         mlx4_cmd(to_mdev(ibdev)->dev, mailbox->dma, 1, 0,
                  MLX4_CMD_SET_NODE, MLX4_CMD_TIME_CLASS_A, MLX4_CMD_NATIVE);
 
@@ -2025,7 +2025,7 @@ static int init_node_data(struct mlx4_ib_dev *dev)
         if (err)
                 goto out;
 
-        memcpy(dev->ib_dev.node_desc, out_mad->data, 64);
+        memcpy(dev->ib_dev.node_desc, out_mad->data, IB_DEVICE_NODE_DESC_MAX);
 
         in_mad->attr_id = IB_SMP_ATTR_NODE_INFO;