From 72c1143e9171eab368ebee3a6f50a01acb612e93 Mon Sep 17 00:00:00 2001
From: Steve Wise <swise@opengridcomputing.com>
Date: Mon, 26 Nov 2007 11:28:44 -0600
Subject: [PATCH] --- yaml --- r: 76797 b: refs/heads/master c:
 7f049f2f4259e4a5c213720df1ce0c2ca095641a h: refs/heads/master i:   76795:
 79186231f3dcddbb0afb8f70c5947b49467054ed v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/infiniband/hw/cxgb3/iwch_provider.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 68968fe67e91..00d7a41b1c97 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 908cf9a565348b5a6d765d120cb189a568ea4883
+refs/heads/master: 7f049f2f4259e4a5c213720df1ce0c2ca095641a
diff --git a/trunk/drivers/infiniband/hw/cxgb3/iwch_provider.c b/trunk/drivers/infiniband/hw/cxgb3/iwch_provider.c
index b5436ca92e68..69b1204e05f0 100644
--- a/trunk/drivers/infiniband/hw/cxgb3/iwch_provider.c
+++ b/trunk/drivers/infiniband/hw/cxgb3/iwch_provider.c
@@ -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);
 }