diff options
| author | Linas Vepstas <linas@austin.ibm.com> | 2006-12-13 22:18:52 +0100 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-05 22:58:44 +0100 |
| commit | 80dab7c7e5b7c4e53e9423c22375bfd9cbf7f2c3 (patch) | |
| tree | 017fca97141b714eb52c1393100d06cb004fed47 /drivers/net/spider_net.c | |
| parent | Spidernet Cleanup return codes (diff) | |
| download | linux-80dab7c7e5b7c4e53e9423c22375bfd9cbf7f2c3.tar.xz linux-80dab7c7e5b7c4e53e9423c22375bfd9cbf7f2c3.zip | |
Spidernet RX Refill
The invocation of the rx ring refill routine is haphazard,
it can be called from a central location.
Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Cc: James K Lewis <jklewis@us.ibm.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/spider_net.c')
| -rw-r--r-- | drivers/net/spider_net.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c index 32a45859dfdd..f58741239196 100644 --- a/drivers/net/spider_net.c +++ b/drivers/net/spider_net.c @@ -980,17 +980,11 @@ spider_net_decode_one_descr(struct spider_net_card *card) status = spider_net_get_descr_status(descr); - /* nothing in the descriptor yet */ - if (status == SPIDER_NET_DESCR_CARDOWNED) + /* Nothing in the descriptor, or ring must be empty */ + if ((status == SPIDER_NET_DESCR_CARDOWNED) || + (status == SPIDER_NET_DESCR_NOT_IN_USE)) return 0; - if (status == SPIDER_NET_DESCR_NOT_IN_USE) { - /* not initialized yet, the ring must be empty */ - spider_net_refill_rx_chain(card); - spider_net_enable_rxdmac(card); - return 0; - } - /* descriptor definitively used -- move on tail */ chain->tail = descr->next; @@ -1074,6 +1068,7 @@ spider_net_poll(struct net_device *netdev, int *budget) netdev->quota -= packets_done; *budget -= packets_done; spider_net_refill_rx_chain(card); + spider_net_enable_rxdmac(card); /* if all packets are in the stack, enable interrupts and return 0 */ /* if not, return 1 */ |