diff options
| author | Greg KH <greg@press.(none)> | 2005-10-28 13:13:16 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 13:13:16 -0400 |
| commit | 6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5 (patch) | |
| tree | c0414e89678fcef7ce3493e048d855bde781ae8d /drivers/net/epic100.c | |
| parent | 1a222bca26ca691e83be1b08f5e96ae96d0d8cae (diff) | |
| parent | 27d1097d39509494706eaa2620ef3b1e780a3224 (diff) | |
Merge ../bleed-2.6
Diffstat (limited to 'drivers/net/epic100.c')
| -rw-r--r-- | drivers/net/epic100.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c index 87f522738bfc..f119ec4e89ea 100644 --- a/drivers/net/epic100.c +++ b/drivers/net/epic100.c | |||
| @@ -1334,7 +1334,7 @@ static void epic_rx_err(struct net_device *dev, struct epic_private *ep) | |||
| 1334 | static int epic_poll(struct net_device *dev, int *budget) | 1334 | static int epic_poll(struct net_device *dev, int *budget) |
| 1335 | { | 1335 | { |
| 1336 | struct epic_private *ep = dev->priv; | 1336 | struct epic_private *ep = dev->priv; |
| 1337 | int work_done, orig_budget; | 1337 | int work_done = 0, orig_budget; |
| 1338 | long ioaddr = dev->base_addr; | 1338 | long ioaddr = dev->base_addr; |
| 1339 | 1339 | ||
| 1340 | orig_budget = (*budget > dev->quota) ? dev->quota : *budget; | 1340 | orig_budget = (*budget > dev->quota) ? dev->quota : *budget; |
| @@ -1343,7 +1343,7 @@ rx_action: | |||
| 1343 | 1343 | ||
| 1344 | epic_tx(dev, ep); | 1344 | epic_tx(dev, ep); |
| 1345 | 1345 | ||
| 1346 | work_done = epic_rx(dev, *budget); | 1346 | work_done += epic_rx(dev, *budget); |
| 1347 | 1347 | ||
| 1348 | epic_rx_err(dev, ep); | 1348 | epic_rx_err(dev, ep); |
| 1349 | 1349 | ||