lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:

	drivers/net/ppp_generic.c
This commit is contained in:
David S. Miller
2008-12-23 17:56:23 -08:00
parent 908a7a16b8 739840d529
commit 6332178d91
8 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/starfire.c
View File

@@ -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: