vmkdrivers File Diff · Conservancy Kallithea

File diff 1efda0e3054b → 052c0cbc4bbf

vmkdrivers/src_9/drivers/net/e1000/e1000_main.c

➞

Show inline comments

@@ ... / @@ -3730,20 +3730,20 @@ static irqreturn_t e1000_intr(int irq, void *data) @@
 		/* guard against interrupt when we're going down */
 		if (!test_bit(__E1000_DOWN, &adapter->state))
 			mod_timer(&adapter->watchdog_timer, jiffies + 1);
+	}
 #ifdef CONFIG_E1000_NAPI
 	/* XXX only using ring 0 for napi */
 #if !defined(__VMKLNX__)
 	/* XXX only using ring 0 for napi */
 	if (likely(netif_rx_schedule_prep(netdev, &adapter->rx_ring[0].napi))) {
 #else /* defined(__VMKLNX__) */
 	if (likely(netif_rx_schedule_prep(netdev, &adapter->napi))) {
 	/* disable interrupts, without the synchronize_irq bit */
 	E1000_WRITE_REG(hw, E1000_IMC, ~0);
 	E1000_WRITE_FLUSH(&adapter->hw);
 	if (likely(netif_rx_schedule_prep(netdev, &adapter->napi))) {
 #endif /* !defined(__VMKLNX__) */
 		adapter->total_tx_bytes = 0;
 		adapter->total_tx_packets = 0;
 		adapter->total_rx_bytes = 0;
 		adapter->total_rx_packets = 0;
 #if !defined(__VMKLNX__)