From 92d1968d0e8d0d8e888601ac8e9eff6073972be3 Mon Sep 17 00:00:00 2001
From: Divy Le Ray <divy@chelsio.com>
Date: Mon, 17 Dec 2007 18:47:41 -0800
Subject: [PATCH] --- yaml --- r: 79216 b: refs/heads/master c:
 bc4b6b52691bae42b1eec3eb86ab4c718387d9f0 h: refs/heads/master v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/net/cxgb3/cxgb3_main.c | 14 ++++----------
 trunk/drivers/net/cxgb3/sge.c        |  7 ++++++-
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 5c0b01900cc5..c3c267053d35 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b881955b7d045e7486e9af08398242aeb7199f67
+refs/heads/master: bc4b6b52691bae42b1eec3eb86ab4c718387d9f0
diff --git a/trunk/drivers/net/cxgb3/cxgb3_main.c b/trunk/drivers/net/cxgb3/cxgb3_main.c
index d1aa7779796e..0e3dcbff002d 100644
--- a/trunk/drivers/net/cxgb3/cxgb3_main.c
+++ b/trunk/drivers/net/cxgb3/cxgb3_main.c
@@ -2408,9 +2408,7 @@ void t3_fatal_err(struct adapter *adapter)
 static pci_ers_result_t t3_io_error_detected(struct pci_dev *pdev,
 					     pci_channel_state_t state)
 {
-	struct net_device *dev = pci_get_drvdata(pdev);
-	struct port_info *pi = netdev_priv(dev);
-	struct adapter *adapter = pi->adapter;
+	struct adapter *adapter = pci_get_drvdata(pdev);
 	int i;
 
 	/* Stop all ports */
@@ -2444,9 +2442,7 @@ static pci_ers_result_t t3_io_error_detected(struct pci_dev *pdev,
  */
 static pci_ers_result_t t3_io_slot_reset(struct pci_dev *pdev)
 {
-	struct net_device *dev = pci_get_drvdata(pdev);
-	struct port_info *pi = netdev_priv(dev);
-	struct adapter *adapter = pi->adapter;
+	struct adapter *adapter = pci_get_drvdata(pdev);
 
 	if (pci_enable_device(pdev)) {
 		dev_err(&pdev->dev,
@@ -2469,9 +2465,7 @@ static pci_ers_result_t t3_io_slot_reset(struct pci_dev *pdev)
  */
 static void t3_io_resume(struct pci_dev *pdev)
 {
-	struct net_device *dev = pci_get_drvdata(pdev);
-	struct port_info *pi = netdev_priv(dev);
-	struct adapter *adapter = pi->adapter;
+	struct adapter *adapter = pci_get_drvdata(pdev);
 	int i;
 
 	/* Restart the ports */
@@ -2491,7 +2485,7 @@ static void t3_io_resume(struct pci_dev *pdev)
 
 	if (is_offload(adapter)) {
 		__set_bit(OFFLOAD_DEVMAP_BIT, &adapter->registered_device_map);
-		if (offload_open(dev))
+		if (offload_open(adapter->port[0]))
 			printk(KERN_WARNING
 			       "Could not bring back offload capabilities\n");
 	}
diff --git a/trunk/drivers/net/cxgb3/sge.c b/trunk/drivers/net/cxgb3/sge.c
index cef153d1d32c..6367cee0d66a 100644
--- a/trunk/drivers/net/cxgb3/sge.c
+++ b/trunk/drivers/net/cxgb3/sge.c
@@ -1364,7 +1364,12 @@ static void restart_ctrlq(unsigned long data)
  */
 int t3_mgmt_tx(struct adapter *adap, struct sk_buff *skb)
 {
-	return ctrl_xmit(adap, &adap->sge.qs[0].txq[TXQ_CTRL], skb);
+	int ret; 
+	local_bh_disable();
+	ret = ctrl_xmit(adap, &adap->sge.qs[0].txq[TXQ_CTRL], skb);
+	local_bh_enable();
+
+	return ret;
 }
 
 /**