From 3891f71c3e6fb386280da660e8214ee7f4d91f71 Mon Sep 17 00:00:00 2001 From: "John W. Linville" Date: Tue, 18 Oct 2005 21:31:01 -0400 Subject: [PATCH] --- yaml --- r: 10337 b: refs/heads/master c: b7b1d2021452d0a3562807b6a90dfa5124147a79 h: refs/heads/master i: 10335: f051f6969629d254727edc6692fc81b15341a86c v: v3 --- [refs] | 2 +- trunk/drivers/net/epic100.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f51115fc7e12..233ce9822658 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ba98d311d0a4ff7dc36d8f435ce60174f4c30ec +refs/heads/master: b7b1d2021452d0a3562807b6a90dfa5124147a79 diff --git a/trunk/drivers/net/epic100.c b/trunk/drivers/net/epic100.c index 87f522738bfc..f119ec4e89ea 100644 --- a/trunk/drivers/net/epic100.c +++ b/trunk/drivers/net/epic100.c @@ -1334,7 +1334,7 @@ static void epic_rx_err(struct net_device *dev, struct epic_private *ep) static int epic_poll(struct net_device *dev, int *budget) { struct epic_private *ep = dev->priv; - int work_done, orig_budget; + int work_done = 0, orig_budget; long ioaddr = dev->base_addr; orig_budget = (*budget > dev->quota) ? dev->quota : *budget; @@ -1343,7 +1343,7 @@ static int epic_poll(struct net_device *dev, int *budget) epic_tx(dev, ep); - work_done = epic_rx(dev, *budget); + work_done += epic_rx(dev, *budget); epic_rx_err(dev, ep);