lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

e1000: init link state correctly

Browse Source 
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>
This commit is contained in:
Jesse Brandeburg
2009-04-17 20:44:36 +00:00
committed by David S. Miller
parent 9c563d2067
commit eb62efd287
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/e1000/e1000_main.c
View File

@@ -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 */
netif_carrier_off(netdev);
netif_stop_queue(netdev);
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 */
netif_carrier_off(netdev);
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)
if (test_bit(__E1000_TESTING, &adapter->flags)) if (test_bit(__E1000_TESTING, &adapter->flags))
return -EBUSY; return -EBUSY;
netif_carrier_off(netdev);
/* allocate transmit descriptors */ /* allocate transmit descriptors */
err = e1000_setup_all_tx_resources(adapter); err = e1000_setup_all_tx_resources(adapter);
if (err) if (err)