提交 b168dfc5 编写于 作者: J Jesse Brandeburg 提交者: David S. Miller

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: NJesse Brandeburg <jesse.brandeburg@intel.com>
Reported-by: NAndrew Lutomirski <amluto@gmail.com>
Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 3a6d1bc4
...@@ -1442,15 +1442,14 @@ static int __devinit igb_probe(struct pci_dev *pdev, ...@@ -1442,15 +1442,14 @@ static int __devinit igb_probe(struct pci_dev *pdev,
* driver. */ * driver. */
igb_get_hw_control(adapter); igb_get_hw_control(adapter);
/* tell the stack to leave us alone until igb_open() is called */
netif_carrier_off(netdev);
netif_tx_stop_all_queues(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);
#ifdef CONFIG_IGB_DCA #ifdef CONFIG_IGB_DCA
if (dca_add_requester(&pdev->dev) == 0) { if (dca_add_requester(&pdev->dev) == 0) {
adapter->flags |= IGB_FLAG_DCA_ENABLED; adapter->flags |= IGB_FLAG_DCA_ENABLED;
...@@ -1699,6 +1698,8 @@ static int igb_open(struct net_device *netdev) ...@@ -1699,6 +1698,8 @@ static int igb_open(struct net_device *netdev)
if (test_bit(__IGB_TESTING, &adapter->state)) if (test_bit(__IGB_TESTING, &adapter->state))
return -EBUSY; return -EBUSY;
netif_carrier_off(netdev);
/* allocate transmit descriptors */ /* allocate transmit descriptors */
err = igb_setup_all_tx_resources(adapter); err = igb_setup_all_tx_resources(adapter);
if (err) if (err)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册