|
@@ -10926,7 +10926,6 @@ static void __devinit tg3_init_link_config(struct tg3 *tp)
|
|
tp->link_config.speed = SPEED_INVALID;
|
|
tp->link_config.speed = SPEED_INVALID;
|
|
tp->link_config.duplex = DUPLEX_INVALID;
|
|
tp->link_config.duplex = DUPLEX_INVALID;
|
|
tp->link_config.autoneg = AUTONEG_ENABLE;
|
|
tp->link_config.autoneg = AUTONEG_ENABLE;
|
|
- netif_carrier_off(tp->dev);
|
|
|
|
tp->link_config.active_speed = SPEED_INVALID;
|
|
tp->link_config.active_speed = SPEED_INVALID;
|
|
tp->link_config.active_duplex = DUPLEX_INVALID;
|
|
tp->link_config.active_duplex = DUPLEX_INVALID;
|
|
tp->link_config.phy_is_low_power = 0;
|
|
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 :
|
|
(pdev->dma_mask == DMA_32BIT_MASK) ? 32 :
|
|
(((u64) pdev->dma_mask == DMA_40BIT_MASK) ? 40 : 64));
|
|
(((u64) pdev->dma_mask == DMA_40BIT_MASK) ? 40 : 64));
|
|
|
|
|
|
|
|
+ netif_carrier_off(tp->dev);
|
|
|
|
+
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
err_out_iounmap:
|
|
err_out_iounmap:
|