diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-18 12:00:46 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-18 12:00:46 -0800 |
commit | b3806c3b940540ba9386a334ff0cc2597a5af60e (patch) | |
tree | 86da1fe926fa6051201046f5d351f0b46aa101b3 /drivers/net/starfire.c | |
parent | 3653b9a8db41299a8735008026dad82035f8ca9b (diff) | |
parent | 3298a7388c00227e736d1037328788073c80c7b4 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
bnx2: Fix bug in bnx2_free_rx_mem().
irda: Add irda_skb_cb qdisc related padding
jme: Fixed a typo
net: kernel BUG at drivers/net/phy/mdio_bus.c:165!
drivers/net: starfire: Fix napi ->poll() weight handling
tlan: Fix pci memory unmapping
enc28j60: use netif_rx_ni() to deliver RX packets
tlan: Fix small (< 64 bytes) datagram transmissions
netfilter: ctnetlink: fix missing CTA_NAT_SEQ_UNSPEC
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 1d2ef8f4778..5a40f2d78be 100644 --- a/drivers/net/starfire.c +++ b/drivers/net/starfire.c @@ -1509,6 +1509,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: |