From 5ebd1d90e28e78293bb2f1828f8c5152b3152616 Mon Sep 17 00:00:00 2001 From: Jeff Mahoney Date: Mon, 20 Mar 2006 22:39:21 -0800 Subject: [PATCH] --- yaml --- r: 22287 b: refs/heads/master c: 59f1741e541bf4f6139599389610a70de49c3ad2 h: refs/heads/master i: 22285: c7afef8d43dafbaaff08725da82886035b8f8613 22283: b380b5c1934e54fa4536133aff2baf13236896ff 22279: d00859badf8f0a616501f83cf3aafb052606f814 22271: bf70158b2a0a10734848ff62944afe0d293df7d3 v: v3 --- [refs] | 2 +- trunk/drivers/net/tg3.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1f248d1cb0bb..8528c8662f9d 100644 --- 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 index e0691cf16456..5104efe8ebfb 100644 --- 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: