diff options
| author | Doug Ledford <dledford@redhat.com> | 2017-08-10 14:34:18 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2017-08-10 14:34:18 -0400 |
| commit | d0d62c34fb746eaf68df5b3d6f4877c7d1e6320c (patch) | |
| tree | 8ce9d1f42907ff6b9455b155ca47ebae143f9a1b /drivers/infiniband/ulp | |
| parent | 320438301b85038e995b5a40a24c43cbc0ed4909 (diff) | |
| parent | db14dff1743e4cd3d840950ad8d735b8957aaf6a (diff) | |
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/ulp')
| -rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c b/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c index 7871379342f4..98e30b41e436 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c @@ -62,8 +62,7 @@ static void ipoib_get_drvinfo(struct net_device *netdev, { struct ipoib_dev_priv *priv = ipoib_priv(netdev); - ib_get_device_fw_str(priv->ca, drvinfo->fw_version, - sizeof(drvinfo->fw_version)); + ib_get_device_fw_str(priv->ca, drvinfo->fw_version); strlcpy(drvinfo->bus_info, dev_name(priv->ca->dev.parent), sizeof(drvinfo->bus_info)); |