From: Linas Vepstas The invocation of the rx ring refill routine is haphazard; centralize and make its usage consistent. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann Signed-off-by: Andrew Morton --- drivers/net/spider_net.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff -puN drivers/net/spider_net.c~spidernet-rx-refill drivers/net/spider_net.c --- a/drivers/net/spider_net.c~spidernet-rx-refill +++ a/drivers/net/spider_net.c @@ -968,8 +968,6 @@ spider_net_decode_one_descr(struct spide if (status == SPIDER_NET_DESCR_NOT_IN_USE) { /* not initialized yet, the ring must be empty */ spin_unlock_irqrestore(&chain->lock, flags); - spider_net_refill_rx_chain(card); - spider_net_enable_rxdmac(card); return 0; } @@ -1058,6 +1056,7 @@ spider_net_poll(struct net_device *netde 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 */ @@ -1197,11 +1196,9 @@ spider_net_set_mac(struct net_device *ne static void spider_net_handle_rxram_full(struct spider_net_card *card) { - int rc = 1; - while (rc) { - rc = spider_net_decode_one_descr(card, 0); - spider_net_refill_rx_chain(card); - } + while (spider_net_decode_one_descr(card, 0)); + + spider_net_refill_rx_chain(card); spider_net_enable_rxchtails(card); spider_net_enable_rxdmac(card); netif_rx_schedule(card->netdev); _