diff options
author | Jesse Brandeburg <jesse.brandeburg@intel.com> | 2009-04-17 16:44:32 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-04-20 05:00:38 -0400 |
commit | b168dfc51604ec293db16dc4d558043585578a2d (patch) | |
tree | 8af4953593909f8e038fbfe3ca53768c28159f33 /drivers/net/igb | |
parent | 3a6d1bc4163fee27c312184d5f1a9cc1e110d300 (diff) |
igb: fix link down inital state
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, 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.
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>
Diffstat (limited to 'drivers/net/igb')
-rw-r--r-- | drivers/net/igb/igb_main.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 08c801490c72..ceaa58554679 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c | |||
@@ -1442,15 +1442,14 @@ static int __devinit igb_probe(struct pci_dev *pdev, | |||
1442 | * driver. */ | 1442 | * driver. */ |
1443 | igb_get_hw_control(adapter); | 1443 | igb_get_hw_control(adapter); |
1444 | 1444 | ||
1445 | /* tell the stack to leave us alone until igb_open() is called */ | ||
1446 | netif_carrier_off(netdev); | ||
1447 | netif_tx_stop_all_queues(netdev); | ||
1448 | |||
1449 | strcpy(netdev->name, "eth%d"); | 1445 | strcpy(netdev->name, "eth%d"); |
1450 | err = register_netdev(netdev); | 1446 | err = register_netdev(netdev); |
1451 | if (err) | 1447 | if (err) |
1452 | goto err_register; | 1448 | goto err_register; |
1453 | 1449 | ||
1450 | /* carrier off reporting is important to ethtool even BEFORE open */ | ||
1451 | netif_carrier_off(netdev); | ||
1452 | |||
1454 | #ifdef CONFIG_IGB_DCA | 1453 | #ifdef CONFIG_IGB_DCA |
1455 | if (dca_add_requester(&pdev->dev) == 0) { | 1454 | if (dca_add_requester(&pdev->dev) == 0) { |
1456 | adapter->flags |= IGB_FLAG_DCA_ENABLED; | 1455 | adapter->flags |= IGB_FLAG_DCA_ENABLED; |
@@ -1699,6 +1698,8 @@ static int igb_open(struct net_device *netdev) | |||
1699 | if (test_bit(__IGB_TESTING, &adapter->state)) | 1698 | if (test_bit(__IGB_TESTING, &adapter->state)) |
1700 | return -EBUSY; | 1699 | return -EBUSY; |
1701 | 1700 | ||
1701 | netif_carrier_off(netdev); | ||
1702 | |||
1702 | /* allocate transmit descriptors */ | 1703 | /* allocate transmit descriptors */ |
1703 | err = igb_setup_all_tx_resources(adapter); | 1704 | err = igb_setup_all_tx_resources(adapter); |
1704 | if (err) | 1705 | if (err) |