---

yaml --- r: 10345 b: refs/heads/master c: c4cfe56 h: refs/heads/master i: 10343: bc9ef67 v: v3
git-mirror · Oct 19, 2005 · 49e6a21 · 49e6a21
1 parent da96cb9
commit 49e6a21
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2aa1d82db7a967b748c4b41854c4222cd0484114
+refs/heads/master: c4cfe567b92d5663f98e2f82f28ffc3069fc982f
diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c
@@ -4347,7 +4347,7 @@ e1000_netpoll(struct net_device *netdev)
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 	disable_irq(adapter->pdev->irq);
 	e1000_intr(adapter->pdev->irq, netdev, NULL);
-	e1000_clean_tx_irq(adapter);
+	e1000_clean_tx_irq(adapter, adapter->tx_ring);
 	enable_irq(adapter->pdev->irq);
 }
 #endif