diff options
| author | Doug Ledford <dledford@redhat.com> | 2017-08-10 21:34:18 +0300 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2017-08-10 21:34:18 +0300 |
| commit | d0d62c34fb746eaf68df5b3d6f4877c7d1e6320c (patch) | |
| tree | 8ce9d1f42907ff6b9455b155ca47ebae143f9a1b /drivers/infiniband/hw/mlx5 | |
| parent | 320438301b85038e995b5a40a24c43cbc0ed4909 (diff) | |
| parent | db14dff1743e4cd3d840950ad8d735b8957aaf6a (diff) | |
| download | linux-d0d62c34fb746eaf68df5b3d6f4877c7d1e6320c.tar.xz | |
Merge branch 'rdma-netlink' into k.o/merge-test
Conflicts:
include/rdma/ib_verbs.h - Modified a function signature adjacent
to a newly added function signature from a previous merge
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/hw/mlx5')
| -rw-r--r-- | drivers/infiniband/hw/mlx5/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c index 483110ec3b80..cde7d1ce4a3c 100644 --- a/drivers/infiniband/hw/mlx5/main.c +++ b/drivers/infiniband/hw/mlx5/main.c @@ -3285,13 +3285,13 @@ static int mlx5_port_immutable(struct ib_device *ibdev, u8 port_num, return 0; } -static void get_dev_fw_str(struct ib_device *ibdev, char *str, - size_t str_len) +static void get_dev_fw_str(struct ib_device *ibdev, char *str) { struct mlx5_ib_dev *dev = container_of(ibdev, struct mlx5_ib_dev, ib_dev); - snprintf(str, str_len, "%d.%d.%04d", fw_rev_maj(dev->mdev), - fw_rev_min(dev->mdev), fw_rev_sub(dev->mdev)); + snprintf(str, IB_FW_VERSION_NAME_MAX, "%d.%d.%04d", + fw_rev_maj(dev->mdev), fw_rev_min(dev->mdev), + fw_rev_sub(dev->mdev)); } static int mlx5_eth_lag_init(struct mlx5_ib_dev *dev) |