From 4c17647d4fa26caadbf8b882990778701bd90d57 Mon Sep 17 00:00:00 2001 From: Linas Vepstas Date: Wed, 13 Dec 2006 15:18:52 -0600 Subject: [PATCH] --- yaml --- r: 46518 b: refs/heads/master c: 80dab7c7e5b7c4e53e9423c22375bfd9cbf7f2c3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/spider_net.c | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 297be6f91589..25f37acbd148 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f7223b8f11f9857fba1dbd5474882219a7ae6e9 +refs/heads/master: 80dab7c7e5b7c4e53e9423c22375bfd9cbf7f2c3 diff --git a/trunk/drivers/net/spider_net.c b/trunk/drivers/net/spider_net.c index 32a45859dfdd..f58741239196 100644 --- a/trunk/drivers/net/spider_net.c +++ b/trunk/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 */