Commit eb62efd2 authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by David S. Miller
Browse files

e1000: init link state correctly

As reported by Andrew Lutomirski <>

All the intel wired ethernet drivers were calling netif_carrier_off
and netif_stop_queue (or variants) before calling register_netdevice

This is incorrect behavior as was pointed out by davem, and causes
ifconfig and friends to report a strange state before first link
after the driver was loaded.

This apparently confused *some* versions of networkmanager.

Andy tested this for e1000e and confirmed it was working for him.
Signed-off-by: default avatarJesse Brandeburg <>
Reported-by: default avatarAndrew Lutomirski <>
Signed-off-by: default avatarJeff Kirsher <>
Signed-off-by: default avatarDavid S. Miller <>
parent 9c563d20
...@@ -1234,15 +1234,14 @@ static int __devinit e1000_probe(struct pci_dev *pdev, ...@@ -1234,15 +1234,14 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
!e1000_check_mng_mode(hw)) !e1000_check_mng_mode(hw))
e1000_get_hw_control(adapter); e1000_get_hw_control(adapter);
/* tell the stack to leave us alone until e1000_open() is called */
strcpy(netdev->name, "eth%d"); strcpy(netdev->name, "eth%d");
err = register_netdev(netdev); err = register_netdev(netdev);
if (err) if (err)
goto err_register; goto err_register;
/* carrier off reporting is important to ethtool even BEFORE open */
DPRINTK(PROBE, INFO, "Intel(R) PRO/1000 Network Connection\n"); DPRINTK(PROBE, INFO, "Intel(R) PRO/1000 Network Connection\n");
cards_found++; cards_found++;
...@@ -1441,6 +1440,8 @@ static int e1000_open(struct net_device *netdev) ...@@ -1441,6 +1440,8 @@ static int e1000_open(struct net_device *netdev)
if (test_bit(__E1000_TESTING, &adapter->flags)) if (test_bit(__E1000_TESTING, &adapter->flags))
return -EBUSY; return -EBUSY;
/* allocate transmit descriptors */ /* allocate transmit descriptors */
err = e1000_setup_all_tx_resources(adapter); err = e1000_setup_all_tx_resources(adapter);
if (err) if (err)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment