diff options
| author | Doug Ledford <dledford@redhat.com> | 2017-08-10 20:34:18 +0200 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2017-08-10 20:34:18 +0200 |
| commit | d0d62c34fb746eaf68df5b3d6f4877c7d1e6320c (patch) | |
| tree | 8ce9d1f42907ff6b9455b155ca47ebae143f9a1b /drivers/infiniband/hw/mthca | |
| parent | Merge branches '32bit_lid' and 'irq_affinity' into k.o/merge-test (diff) | |
| parent | Merge tag 'rdma-next-2017-08-10' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| download | linux-d0d62c34fb746eaf68df5b3d6f4877c7d1e6320c.tar.xz linux-d0d62c34fb746eaf68df5b3d6f4877c7d1e6320c.zip | |
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/mthca')
| -rw-r--r-- | drivers/infiniband/hw/mthca/mthca_provider.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c index c197cd9b193f..eae9bffd45d4 100644 --- a/drivers/infiniband/hw/mthca/mthca_provider.c +++ b/drivers/infiniband/hw/mthca/mthca_provider.c @@ -1178,12 +1178,11 @@ static int mthca_port_immutable(struct ib_device *ibdev, u8 port_num, return 0; } -static void get_dev_fw_str(struct ib_device *device, char *str, - size_t str_len) +static void get_dev_fw_str(struct ib_device *device, char *str) { struct mthca_dev *dev = container_of(device, struct mthca_dev, ib_dev); - snprintf(str, str_len, "%d.%d.%d", + snprintf(str, IB_FW_VERSION_NAME_MAX, "%d.%d.%d", (int) (dev->fw_ver >> 32), (int) (dev->fw_ver >> 16) & 0xffff, (int) dev->fw_ver & 0xffff); |