---

yaml --- r: 18813 b: refs/heads/master c: e8da8be h: refs/heads/master i: 18811: 85d6ba3 v: v3
git-mirror · Jan 17, 2006 · 50a7386 · 50a7386
1 parent 8d10b97
commit 50a7386
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce7393b93502f52e2ef7259e9e9bc3b1a1fd6799
+refs/heads/master: e8da8be146e6043fb4b60a222be0014a0fb46d24
diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c
@@ -4449,6 +4449,9 @@ e1000_netpoll(struct net_device *netdev)
 	disable_irq(adapter->pdev->irq);
 	e1000_intr(adapter->pdev->irq, netdev, NULL);
 	e1000_clean_tx_irq(adapter, adapter->tx_ring);
+#ifndef CONFIG_E1000_NAPI
+	adapter->clean_rx(adapter, adapter->rx_ring);
+#endif
 	enable_irq(adapter->pdev->irq);
 }
 #endif