summaryrefslogtreecommitdiff
path: root/drivers/net/starfire.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-12-24 04:56:23 +0300
committerDavid S. Miller <davem@davemloft.net>2008-12-24 04:56:23 +0300
commit6332178d91ca1a9dbd99bd97cabbcf965d178e9f (patch)
treed98af2cbc7ff0e9e4d00b6cc8c79b05ca7815a5f /drivers/net/starfire.c
parent908a7a16b852ffd618a9127be8d62432182d81b4 (diff)
parent739840d529eb7505d3cbfe9d468bf1440c9a8e27 (diff)
downloadlinux-6332178d91ca1a9dbd99bd97cabbcf965d178e9f.tar.xz
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/ppp_generic.c
Diffstat (limited to 'drivers/net/starfire.c')
-rw-r--r--drivers/net/starfire.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c
index d5b9dd842c61..1902f4fabde1 100644
--- a/drivers/net/starfire.c
+++ b/drivers/net/starfire.c
@@ -1503,6 +1503,11 @@ static int __netdev_rx(struct net_device *dev, int *quota)
desc->status = 0;
np->rx_done = (np->rx_done + 1) % DONE_Q_SIZE;
}
+
+ if (*quota == 0) { /* out of rx quota */
+ retcode = 1;
+ goto out;
+ }
writew(np->rx_done, np->base + CompletionQConsumerIdx);
out: