diff mbox

[net-next-2.6,1/5] ixgbe: fix link down initial state

Message ID 20090418064427.4328.45811.stgit@localhost.localdomain
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Kirsher, Jeffrey T April 18, 2009, 6:44 a.m. UTC 
From: Jesse Brandeburg <jesse.brandeburg@intel.com>

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>
---

 drivers/net/ixgbe/ixgbe_main.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

David Miller April 20, 2009, 9:04 a.m. UTC | #1 
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Fri, 17 Apr 2009 23:44:27 -0700

> 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.

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 :-)
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Kirsher, Jeffrey T April 20, 2009, 9:15 a.m. UTC | #2 
On Mon, Apr 20, 2009 at 2:04 AM, David Miller <davem@davemloft.net> wrote:
> From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri, 17 Apr 2009 23:44:27 -0700
>
>> 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.
>
> 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.
diff mbox

Patch

diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 0d9a3ac..d5d9589 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -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;