diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-24 02:07:21 +0300 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-24 02:07:21 +0300 |
| commit | 9156ad48338e0306e508ead5c0d9986050744475 (patch) | |
| tree | 37f3a90e38190052ecf3cdf9171dfdddd37b56fd /drivers/net/epic100.c | |
| parent | fa28237cfcc5827553044cbd6ee52e33692b0faa (diff) | |
| parent | 8f7b3d156d348b6766833cd4e272d0d19b501e64 (diff) | |
| download | linux-9156ad48338e0306e508ead5c0d9986050744475.tar.xz | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/net/epic100.c')
| -rw-r--r-- | drivers/net/epic100.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c index ecdd3fc8d70c..0b365b8d947b 100644 --- a/drivers/net/epic100.c +++ b/drivers/net/epic100.c @@ -1273,7 +1273,7 @@ rx_action: epic_rx_err(dev, ep); - if (netif_running(dev) && (work_done < budget)) { + if (work_done < budget) { unsigned long flags; int more; |