diff options
Diffstat (limited to 'drivers/net/e1000e')
-rw-r--r-- | drivers/net/e1000e/netdev.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 1693ed116b16..c0ff550262ff 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c | |||
@@ -3072,6 +3072,8 @@ static int e1000_open(struct net_device *netdev) | |||
3072 | if (test_bit(__E1000_TESTING, &adapter->state)) | 3072 | if (test_bit(__E1000_TESTING, &adapter->state)) |
3073 | return -EBUSY; | 3073 | return -EBUSY; |
3074 | 3074 | ||
3075 | netif_carrier_off(netdev); | ||
3076 | |||
3075 | /* allocate transmit descriptors */ | 3077 | /* allocate transmit descriptors */ |
3076 | err = e1000e_setup_tx_resources(adapter); | 3078 | err = e1000e_setup_tx_resources(adapter); |
3077 | if (err) | 3079 | if (err) |
@@ -5037,15 +5039,14 @@ static int __devinit e1000_probe(struct pci_dev *pdev, | |||
5037 | if (!(adapter->flags & FLAG_HAS_AMT)) | 5039 | if (!(adapter->flags & FLAG_HAS_AMT)) |
5038 | e1000_get_hw_control(adapter); | 5040 | e1000_get_hw_control(adapter); |
5039 | 5041 | ||
5040 | /* tell the stack to leave us alone until e1000_open() is called */ | ||
5041 | netif_carrier_off(netdev); | ||
5042 | netif_tx_stop_all_queues(netdev); | ||
5043 | |||
5044 | strcpy(netdev->name, "eth%d"); | 5042 | strcpy(netdev->name, "eth%d"); |
5045 | err = register_netdev(netdev); | 5043 | err = register_netdev(netdev); |
5046 | if (err) | 5044 | if (err) |
5047 | goto err_register; | 5045 | goto err_register; |
5048 | 5046 | ||
5047 | /* carrier off reporting is important to ethtool even BEFORE open */ | ||
5048 | netif_carrier_off(netdev); | ||
5049 | |||
5049 | e1000_print_device_info(adapter); | 5050 | e1000_print_device_info(adapter); |
5050 | 5051 | ||
5051 | return 0; | 5052 | return 0; |