Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db97ed0a authored by Bart Van Assche's avatar Bart Van Assche Committed by Doug Ledford
Browse files

IB/IPoIB: Switch from dma_device to dev.parent 



Prepare for removal of ib_device.dma_device.

Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 85e9f1db

drivers/infiniband/ulp/ipoib/ipoib_ethtool.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static void ipoib_get_drvinfo(struct net_device *netdev, 
	ib_get_device_fw_str(priv->ca, drvinfo->fw_version,

			     sizeof(drvinfo->fw_version));



	strlcpy(drvinfo->bus_info, dev_name(priv->ca->dma_device),

	strlcpy(drvinfo->bus_info, dev_name(priv->ca->dev.parent),

		sizeof(drvinfo->bus_info));



	strlcpy(drvinfo->version, ipoib_driver_version,

drivers/infiniband/ulp/ipoib/ipoib_main.c

+1 −1
Original line number Diff line number Diff line
@@ -2022,7 +2022,7 @@ static struct net_device *ipoib_add_port(const char *format, 
	if (!priv)

		goto alloc_mem_failed;



	SET_NETDEV_DEV(priv->dev, hca->dma_device);

	SET_NETDEV_DEV(priv->dev, hca->dev.parent);

	priv->dev->dev_id = port - 1;



	result = ib_query_port(hca, port, &attr);