diff options
Diffstat (limited to 'drivers/net/tg3.c')
-rw-r--r-- | drivers/net/tg3.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index e0691cf16456..5104efe8ebfb 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -10926,7 +10926,6 @@ static void __devinit tg3_init_link_config(struct tg3 *tp) | |||
10926 | tp->link_config.speed = SPEED_INVALID; | 10926 | tp->link_config.speed = SPEED_INVALID; |
10927 | tp->link_config.duplex = DUPLEX_INVALID; | 10927 | tp->link_config.duplex = DUPLEX_INVALID; |
10928 | tp->link_config.autoneg = AUTONEG_ENABLE; | 10928 | tp->link_config.autoneg = AUTONEG_ENABLE; |
10929 | netif_carrier_off(tp->dev); | ||
10930 | tp->link_config.active_speed = SPEED_INVALID; | 10929 | tp->link_config.active_speed = SPEED_INVALID; |
10931 | tp->link_config.active_duplex = DUPLEX_INVALID; | 10930 | tp->link_config.active_duplex = DUPLEX_INVALID; |
10932 | tp->link_config.phy_is_low_power = 0; | 10931 | tp->link_config.phy_is_low_power = 0; |
@@ -11390,6 +11389,8 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, | |||
11390 | (pdev->dma_mask == DMA_32BIT_MASK) ? 32 : | 11389 | (pdev->dma_mask == DMA_32BIT_MASK) ? 32 : |
11391 | (((u64) pdev->dma_mask == DMA_40BIT_MASK) ? 40 : 64)); | 11390 | (((u64) pdev->dma_mask == DMA_40BIT_MASK) ? 40 : 64)); |
11392 | 11391 | ||
11392 | netif_carrier_off(tp->dev); | ||
11393 | |||
11393 | return 0; | 11394 | return 0; |
11394 | 11395 | ||
11395 | err_out_iounmap: | 11396 | err_out_iounmap: |