---

yaml
---
r: 149791
b: refs/heads/master
c: 9c563d2
h: refs/heads/master
i:
  149789: b8c20ea
  149787: 2ba6b3a
  149783: b0e50fe
  149775: 77cbaa6
  149759: 00c6ac3
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b168dfc51604ec293db16dc4d558043585578a2d
+refs/heads/master: 9c563d20671e5fbe3045fd79c18b306ccb77b0b6

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;