Skip to content

Commit

Permalink
e1000e: indicate link down at load
Browse files Browse the repository at this point in the history
As reported by Andrew Lutomirski <[email protected]>

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, since without a netif_carrier_off, the stack
assumes carrier_on, but before register_netdev, netlink messages are not
sent out telling link state.

This apparently confused *some* versions of networkmanager.

Andy tested this for e1000e and confirmed it was working for him.

see thread: http://marc.info/?l=linux-netdev&m=123946479705636&w=2

Signed-off-by: Jesse Brandeburg <[email protected]>
Tested-by: Andy Lutomirski <[email protected]>
Signed-off-by: Jeff Kirsher <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
jbrandeb authored and davem330 committed Apr 20, 2009
1 parent b168dfc commit 9c563d2
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions drivers/net/e1000e/netdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -3072,6 +3072,8 @@ static int e1000_open(struct net_device *netdev)
if (test_bit(__E1000_TESTING, &adapter->state))
return -EBUSY;

netif_carrier_off(netdev);

/* allocate transmit descriptors */
err = e1000e_setup_tx_resources(adapter);
if (err)
Expand Down Expand Up @@ -5037,15 +5039,14 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
if (!(adapter->flags & FLAG_HAS_AMT))
e1000_get_hw_control(adapter);

/* tell the stack to leave us alone until e1000_open() is called */
netif_carrier_off(netdev);
netif_tx_stop_all_queues(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);

e1000_print_device_info(adapter);

return 0;
Expand Down

0 comments on commit 9c563d2

Please sign in to comment.