please pull infiniband.git
Linus, please pull from
master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git for-linus
This tree is also available from kernel.org mirrors at:
git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git for-linus
This will get a fix for one regression introduced earlier in the 2.6.26 cycle:
Steve Wise (1):
RDMA/cxgb3: Fix regression caused by class_device -> device conversion
drivers/infiniband/hw/cxgb3/iwch_provider.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
drivers/infiniband/hw/cxgb3/iwch_provider.c +4 -0
@@ -1096,7 +1096,9 @@ static ssize_t show_fw_ver(struct device *dev, struct device_attribute *attr, chstruct 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); }