---

yaml
---
r: 57103
b: refs/heads/master
c: 4731305
h: refs/heads/master
i:
  57101: 39da456
  57099: c7bc0c4
  57095: 29472e7
  57087: c4afeac
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a32352661cc8e942897d205ba18f871ef7be597
+refs/heads/master: 47313054352b879a2bc65379d55b05f48a0af7ec

trunk/drivers/net/e1000/e1000_main.c

@@ -1325,7 +1325,10 @@ e1000_sw_init(struct e1000_adapter *adapter)
 	spin_lock_init(&adapter->tx_queue_lock);
 #endif
 
-	atomic_set(&adapter->irq_sem, 1);
+	/* Explicitly disable IRQ since the NIC can be in any state. */
+	atomic_set(&adapter->irq_sem, 0);
+	e1000_irq_disable(adapter);
+
 	spin_lock_init(&adapter->stats_lock);
 
 	set_bit(__E1000_DOWN, &adapter->flags);
@@ -1431,6 +1434,10 @@ e1000_open(struct net_device *netdev)
 	/* From here on the code is the same as e1000_up() */
 	clear_bit(__E1000_DOWN, &adapter->flags);
 
+#ifdef CONFIG_E1000_NAPI
+	netif_poll_enable(netdev);
+#endif
+
 	e1000_irq_enable(adapter);
 
 	/* fire a link status change interrupt to start the watchdog */