diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-12 12:22:34 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-12 12:22:34 -0400 |
| commit | 63788ea9245688772d13b979bea05bd72b239aad (patch) | |
| tree | 13f00cc8f6da1ed6c583947652bbedb2a0e27693 /drivers | |
| parent | 349188f66da2fd88f8cb2407763051d8e136c9aa (diff) | |
| parent | d7b9dfc8ea43936e6e8eec3040dcf4f110563868 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/e1000/e1000_main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 5e5d2c3c7ce4..b82fd15d0891 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
| @@ -3789,6 +3789,7 @@ e1000_netpoll(struct net_device *netdev) | |||
| 3789 | struct e1000_adapter *adapter = netdev_priv(netdev); | 3789 | struct e1000_adapter *adapter = netdev_priv(netdev); |
| 3790 | disable_irq(adapter->pdev->irq); | 3790 | disable_irq(adapter->pdev->irq); |
| 3791 | e1000_intr(adapter->pdev->irq, netdev, NULL); | 3791 | e1000_intr(adapter->pdev->irq, netdev, NULL); |
| 3792 | e1000_clean_tx_irq(adapter); | ||
| 3792 | enable_irq(adapter->pdev->irq); | 3793 | enable_irq(adapter->pdev->irq); |
| 3793 | } | 3794 | } |
| 3794 | #endif | 3795 | #endif |