diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-24 02:56:23 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-24 02:56:23 +0100 |
| commit | 6332178d91ca1a9dbd99bd97cabbcf965d178e9f (patch) | |
| tree | d98af2cbc7ff0e9e4d00b6cc8c79b05ca7815a5f /drivers/net/starfire.c | |
| parent | net: Remove unused netdev arg from some NAPI interfaces. (diff) | |
| parent | ppp: fix segfaults introduced by netdev_priv changes (diff) | |
| download | linux-6332178d91ca1a9dbd99bd97cabbcf965d178e9f.tar.xz linux-6332178d91ca1a9dbd99bd97cabbcf965d178e9f.zip | |
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.c | 5 |
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: |