Skip to content

Commit

Permalink
e1000: init link state correctly
Browse files Browse the repository at this point in the history
As reported by Andrew Lutomirski <amluto@gmail.com>

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: Jesse Brandeburg <jesse.brandeburg@intel.com>
Reported-by: Andrew Lutomirski <amluto@gmail.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Jesse Brandeburg authored and David S. Miller committed Apr 20, 2009
1 parent 9c563d2 commit eb62efd
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions drivers/net/e1000/e1000_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1234,15 +1234,14 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
!e1000_check_mng_mode(hw))
e1000_get_hw_control(adapter);

/* tell the stack to leave us alone until e1000_open() is called */
netif_carrier_off(netdev);
netif_stop_queue(netdev);

strcpy(netdev->name, "eth%d");
err = register_netdev(netdev);
if (err)
goto err_register;

/* carrier off reporting is important to ethtool even BEFORE open */
netif_carrier_off(netdev);

DPRINTK(PROBE, INFO, "Intel(R) PRO/1000 Network Connection\n");

cards_found++;
Expand Down Expand Up @@ -1441,6 +1440,8 @@ static int e1000_open(struct net_device *netdev)
if (test_bit(__E1000_TESTING, &adapter->flags))
return -EBUSY;

netif_carrier_off(netdev);

/* allocate transmit descriptors */
err = e1000_setup_all_tx_resources(adapter);
if (err)
Expand Down

0 comments on commit eb62efd

Please sign in to comment.