ixgbe: fix link down initial state
Subsystems (2)
PATCH 1/5 ixgbe: fix link down initial state
From: Jesse Brandeburg <[email protected]>
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.
---
drivers/net/ixgbe/ixgbe_main.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
drivers/net/ixgbe/ixgbe_main.c +5 -2
@@ -3459,6 +3459,8 @@ static int ixgbe_open(struct net_device *netdev)if (test_bit (__IXGBE_TESTING, &adapter->state))return -EBUSY ; +netif_carrier_off (netdev); +/* allocate transmit descriptors */ err =ixgbe_setup_all_tx_resources (adapter);if (err)
@@ -4772,13 +4774,14 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,/* reset the hardware with the new settings */ hw->mac.ops.start_hw (hw); -netif_carrier_off (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); +#ifdef CONFIG_IXGBE_DCA if (dca_add_requester (&pdev->dev) ==0 ) { adapter->flags |=IXGBE_FLAG_DCA_ENABLED ;
PATCH 2/5 ixgb: fix link down initial state
From: Jesse Brandeburg <[email protected]>
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.
in addition this driver appeared to need a netif_start_queue at the end of open.
---
drivers/net/ixgb/ixgb_main.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-)
drivers/net/ixgb/ixgb_main.c +5 -3
@@ -471,10 +471,8 @@ ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)if (err) goto err_register; -/* we're going to reset, so assume we have no link for now */ - +/* carrier off reporting is important to ethtool even BEFORE open */ netif_carrier_off (netdev); -netif_stop_queue (netdev);DPRINTK (PROBE ,INFO ,"Intel(R) PRO/10GbE Network Connection\n" );ixgb_check_options (adapter);
@@ -592,6 +590,8 @@ ixgb_open(struct net_device *netdev)if (err) goto err_setup_tx; +netif_carrier_off (netdev); +/* allocate receive descriptors */ err =ixgb_setup_rx_resources (adapter);
@@ -602,6 +602,8 @@ ixgb_open(struct net_device *netdev)if (err) goto err_up; +netif_start_queue (netdev); +return 0 ; err_up:
PATCH 3/5 igb: fix link down inital state
In reply to Jeff KirsherFrom: Jesse Brandeburg <[email protected]>
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.
---
drivers/net/igb/igb_main.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)
drivers/net/igb/igb_main.c +5 -4
@@ -1442,15 +1442,14 @@ static int __devinit igb_probe(struct pci_dev *pdev,* driver. */ 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" ); err =register_netdev (netdev);if (err) goto err_register; +/* carrier off reporting is important to ethtool even BEFORE open */ +netif_carrier_off (netdev); +#ifdef CONFIG_IGB_DCA if (dca_add_requester (&pdev->dev) ==0 ) { adapter->flags |=IGB_FLAG_DCA_ENABLED ;
@@ -1699,6 +1698,8 @@ static int igb_open(struct net_device *netdev)if (test_bit (__IGB_TESTING, &adapter->state))return -EBUSY ; +netif_carrier_off (netdev); +/* allocate transmit descriptors */ err =igb_setup_all_tx_resources (adapter);if (err)
PATCH 4/5 e1000e: indicate link down at load
In reply to Jeff KirsherFrom: Jesse Brandeburg <[email protected]>
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
---
drivers/net/e1000e/netdev.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)
drivers/net/e1000e/netdev.c +5 -4
@@ -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)
@@ -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 ;
PATCH 5/5 e1000: init link state correctly
In reply to Jeff KirsherFrom: Jesse Brandeburg <[email protected]>
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.
This apparently confused *some* versions of networkmanager.
Andy tested this for e1000e and confirmed it was working for him.
---
drivers/net/e1000/e1000_main.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)
drivers/net/e1000/e1000_main.c +5 -4
@@ -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++;
@@ -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)
David Miller
maintainerFrom: Jeff Kirsher <[email protected]>
Date: Fri, 17 Apr 2009 23:44:27 -0700
Quoted 8 lines
All the intel wired ethernet drivers were calling
netif_carrier_offandnetif_stop_queue(or variants) before callingregister_netdeviceThis 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 assumescarrier_on, but beforeregister_netdev, netlink messages are not sent out telling link state.
All 5 patches applied, thanks!
FWIW, this is definitely a case where I would have found it just as appropriate to post one single patch for this. But that's just me :-)
Quoted 12 lines · David Miller
From: Jeff Kirsher <[email protected]>
Date: Fri, 17 Apr 2009 23:44:27 -0700Quoted 8 lines
All the intel wired ethernet drivers were calling
netif_carrier_offandnetif_stop_queue(or variants) before callingregister_netdeviceThis 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 assumescarrier_on, but beforeregister_netdev, netlink messages are not sent out telling link state.
Quoted 5 lines
All 5 patches applied, thanks!
FWIW, this is definitely a case where I would have found it just as appropriate to post one single patch for this. But that's just me :-) --
Good to know, that was discussed, but we thought it would be better for git logging to have separate patches.
Signature · 2 lines
Cheers, Jeff