From 7413b60f46b7e3535770d5cce01df965520fc755 Mon Sep 17 00:00:00 2001
From: Michael Chan <mchan@broadcom.com>
Date: Sun, 17 Dec 2006 17:07:29 -0800
Subject: [PATCH] --- yaml --- r: 44665 b: refs/heads/master c:
 c49a1561ee4b663d2819b5bea3e4684eae217b19 h: refs/heads/master i:   44663:
 6507cbb5d6b4cf628d58e4688f85d30a743d2fc8 v: v3

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

diff --git a/[refs] b/[refs]
index 9efdf560237d..061775a48fda 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24fcad6b3ca3bdbbb4614de3edc1ff16f594ba9a
+refs/heads/master: c49a1561ee4b663d2819b5bea3e4684eae217b19
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index e47a9c1f35cb..501ea6da03cc 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -6981,6 +6981,8 @@ static int tg3_open(struct net_device *dev)
 	struct tg3 *tp = netdev_priv(dev);
 	int err;
 
+	netif_carrier_off(tp->dev);
+
 	tg3_full_lock(tp, 0);
 
 	err = tg3_set_power_state(tp, PCI_D0);
@@ -11920,6 +11922,8 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
 	 */
 	pci_save_state(tp->pdev);
 
+	pci_set_drvdata(pdev, dev);
+
 	err = register_netdev(dev);
 	if (err) {
 		printk(KERN_ERR PFX "Cannot register net device, "
@@ -11927,8 +11931,6 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
 		goto err_out_iounmap;
 	}
 
-	pci_set_drvdata(pdev, dev);
-
 	printk(KERN_INFO "%s: Tigon3 [partno(%s) rev %04x PHY(%s)] (%s) %s Ethernet ",
 	       dev->name,
 	       tp->board_part_number,
@@ -11959,8 +11961,6 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
 	       (pdev->dma_mask == DMA_32BIT_MASK) ? 32 :
 	        (((u64) pdev->dma_mask == DMA_40BIT_MASK) ? 40 : 64));
 
-	netif_carrier_off(tp->dev);
-
 	return 0;
 
 err_out_iounmap: