[PATCH 4/16] Spidernet Refactor RX refill
From: Linas Vepstas <hidden>
Date: 2006-12-06 23:33:21
Also in:
linuxppc-dev
Refactor how spider_net_refill_rx_chain() is called. No functional change; this just simplifies the code by moving the subroutine call to a more appropriate spot. Signed-off-by: Linas Vepstas <redacted> Cc: James K Lewis <redacted> Cc: Arnd Bergmann <arnd@arndb.de> ---- drivers/net/spider_net.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) Index: linux-2.6.19-git7/drivers/net/spider_net.c ===================================================================
--- linux-2.6.19-git7.orig/drivers/net/spider_net.c 2006-12-06 16:01:49.000000000 -0600
+++ linux-2.6.19-git7/drivers/net/spider_net.c 2006-12-06 16:02:58.000000000 -0600@@ -1023,10 +1023,8 @@ spider_net_decode_one_descr(struct spide /* ok, we've got a packet in descr */ result = spider_net_pass_skb_up(descr, card, napi); refill: - descr->dmac_cmd_status = SPIDER_NET_DESCR_NOT_IN_USE; /* change the descriptor state: */ - if (!napi) - spider_net_refill_rx_chain(card); + descr->dmac_cmd_status = SPIDER_NET_DESCR_NOT_IN_USE; return result; }
@@ -1205,8 +1203,11 @@ spider_net_set_mac(struct net_device *ne static void spider_net_handle_rxram_full(struct spider_net_card *card) { - while (spider_net_decode_one_descr(card, 0)) - ; + int rc = 1; + while (rc) { + rc = 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);