RDMA/cxgb3: Hold rtnl_lock() around ethtool get_drvinfo call
authorSteve Wise <swise@opengridcomputing.com>
Mon, 26 Nov 2007 17:28:44 +0000 (11:28 -0600)
committerRoland Dreier <rolandd@cisco.com>
Fri, 25 Jan 2008 22:15:26 +0000 (14:15 -0800)
Currently the call into cxgb3 to get the driver info is not serialized.
The iw_cxgb3 module needs to hold the rtnl_lock around the ethtool ops
call like dev_ioctl() does.

Signed-off-by: Steve Wise <swise@opengridcomputing.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
drivers/infiniband/hw/cxgb3/iwch_provider.c

index b5436ca92e68cdb8d09063861ecd7af6bb89eeb5..69b1204e05f05b6c672a0bfb0fbc3d6f56fa74bb 100644 (file)
@@ -39,6 +39,7 @@
 #include <linux/list.h>
 #include <linux/spinlock.h>
 #include <linux/ethtool.h>
+#include <linux/rtnetlink.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
@@ -1053,7 +1054,9 @@ static ssize_t show_fw_ver(struct class_device *cdev, char *buf)
        struct net_device *lldev = dev->rdev.t3cdev_p->lldev;
 
        PDBG("%s class dev 0x%p\n", __FUNCTION__, cdev);
+       rtnl_lock();
        lldev->ethtool_ops->get_drvinfo(lldev, &info);
+       rtnl_unlock();
        return sprintf(buf, "%s\n", info.fw_version);
 }
 
@@ -1065,7 +1068,9 @@ static ssize_t show_hca(struct class_device *cdev, char *buf)
        struct net_device *lldev = dev->rdev.t3cdev_p->lldev;
 
        PDBG("%s class dev 0x%p\n", __FUNCTION__, cdev);
+       rtnl_lock();
        lldev->ethtool_ops->get_drvinfo(lldev, &info);
+       rtnl_unlock();
        return sprintf(buf, "%s\n", info.driver);
 }