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

Commit 6329d302 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  RDMA/cxgb3: Fix regression caused by class_device -> device conversion
parents b72e9ebe 5e19cf66

drivers/infiniband/hw/cxgb3/iwch_provider.c

+4 −0
Original line number Diff line number Diff line
@@ -1096,7 +1096,9 @@ static ssize_t show_fw_ver(struct device *dev, struct device_attribute *attr, ch 
	struct net_device *lldev = iwch_dev->rdev.t3cdev_p->lldev;



	PDBG("%s dev 0x%p\n", __func__, dev);

	rtnl_lock();

	lldev->ethtool_ops->get_drvinfo(lldev, &info);

	rtnl_unlock();

	return sprintf(buf, "%s\n", info.fw_version);

}
@@ -1109,7 +1111,9 @@ static ssize_t show_hca(struct device *dev, struct device_attribute *attr, 
	struct net_device *lldev = iwch_dev->rdev.t3cdev_p->lldev;



	PDBG("%s dev 0x%p\n", __func__, dev);

	rtnl_lock();

	lldev->ethtool_ops->get_drvinfo(lldev, &info);

	rtnl_unlock();

	return sprintf(buf, "%s\n", info.driver);

}