---

yaml --- r: 22287 b: refs/heads/master c: 59f1741 h: refs/heads/master i: 22285: c7afef8 22283: b380b5c 22279: d00859b 22271: bf70158 v: v3
git-mirror · Mar 21, 2006 · 5ebd1d9 · 5ebd1d9
1 parent 6f37d1e
commit 5ebd1d9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87546b1c25daa2c72ba6741c777f76c1eac6e2d9
+refs/heads/master: 59f1741e541bf4f6139599389610a70de49c3ad2
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
@@ -10926,7 +10926,6 @@ static void __devinit tg3_init_link_config(struct tg3 *tp)
 	tp->link_config.speed = SPEED_INVALID;
 	tp->link_config.duplex = DUPLEX_INVALID;
 	tp->link_config.autoneg = AUTONEG_ENABLE;
-	netif_carrier_off(tp->dev);
 	tp->link_config.active_speed = SPEED_INVALID;
 	tp->link_config.active_duplex = DUPLEX_INVALID;
 	tp->link_config.phy_is_low_power = 0;
@@ -11390,6 +11389,8 @@ 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: