From cd296d805d7b466b3f6dd44351d5b2a4acae729b Mon Sep 17 00:00:00 2001
From: Divy Le Ray <divy@chelsio.com>
Date: Fri, 16 Nov 2007 11:21:50 -0800
Subject: [PATCH] --- yaml --- r: 78955 b: refs/heads/master c:
 67d92ab765a29cd18674b2b87e9f931782a245e3 h: refs/heads/master i:   78953:
 a1cd6fd5d89f21f3d5c76d2321f46aabf9bd75f8   78951:
 8712f6cae44bd6c7bcb5e7b9efd2bb6d1690f2a1 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/cxgb3/cxgb3_main.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index e3a1040225c1..c58f83e30396 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 678771d6f5242573fe4eb9fc14f7479646d52cf6
+refs/heads/master: 67d92ab765a29cd18674b2b87e9f931782a245e3
diff --git a/trunk/drivers/net/cxgb3/cxgb3_main.c b/trunk/drivers/net/cxgb3/cxgb3_main.c
index d92da8fe4a50..9d14652ffdc3 100644
--- a/trunk/drivers/net/cxgb3/cxgb3_main.c
+++ b/trunk/drivers/net/cxgb3/cxgb3_main.c
@@ -2585,10 +2585,6 @@ static void __devexit remove_one(struct pci_dev *pdev)
 		sysfs_remove_group(&adapter->port[0]->dev.kobj,
 				   &cxgb3_attr_group);
 
-		for_each_port(adapter, i)
-		    if (test_bit(i, &adapter->registered_device_map))
-			unregister_netdev(adapter->port[i]);
-
 		if (is_offload(adapter)) {
 			cxgb3_adapter_unofld(adapter);
 			if (test_bit(OFFLOAD_DEVMAP_BIT,
@@ -2596,6 +2592,10 @@ static void __devexit remove_one(struct pci_dev *pdev)
 				offload_close(&adapter->tdev);
 		}
 
+		for_each_port(adapter, i)
+		    if (test_bit(i, &adapter->registered_device_map))
+			unregister_netdev(adapter->port[i]);
+
 		t3_free_sge_resources(adapter);
 		cxgb_disable_msi(adapter);