From 60993685fed92aea8d4a60fdebe1fb8ac8f1ee36 Mon Sep 17 00:00:00 2001
From: Jesse Brandeburg <jesse.brandeburg@intel.com>
Date: Fri, 17 Apr 2009 20:44:34 +0000
Subject: [PATCH] --- yaml --- r: 149791 b: refs/heads/master c:
 9c563d20671e5fbe3045fd79c18b306ccb77b0b6 h: refs/heads/master i:   149789:
 b8c20ea56594a8dc25e742107f4f1e390067783e   149787:
 2ba6b3ad7708a5beb5d25301aa44ce44e2076d0f   149783:
 b0e50fea0097a51b8ea6c082f816dfe3c024a00e   149775:
 77cbaa63486ade9c37c9988e776382b41c65efcd   149759:
 00c6ac31af2a3c909da8e64560819b8267f2ff1f v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/net/e1000e/netdev.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 0e1aefaaec16..e698fd0271b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b168dfc51604ec293db16dc4d558043585578a2d
+refs/heads/master: 9c563d20671e5fbe3045fd79c18b306ccb77b0b6
diff --git a/trunk/drivers/net/e1000e/netdev.c b/trunk/drivers/net/e1000e/netdev.c
index 1693ed116b16..c0ff550262ff 100644
--- a/trunk/drivers/net/e1000e/netdev.c
+++ b/trunk/drivers/net/e1000e/netdev.c
@@ -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;