The patch titled
spidernet: refactor RX refill
has been removed from the -mm tree. Its filename was
spidernet-refactor-rx-refill.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
Subject: spidernet: refactor RX refill
From: Linas Vepstas <linas@xxxxxxxxxxxxxx>
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 <linas@xxxxxxxxxxxxxx>
Cc: James K Lewis <jklewis@xxxxxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/spider_net.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff -puN drivers/net/spider_net.c~spidernet-refactor-rx-refill drivers/net/spider_net.c
--- a/drivers/net/spider_net.c~spidernet-refactor-rx-refill
+++ a/drivers/net/spider_net.c
@@ -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);
_
Patches currently in -mm which might be from linas@xxxxxxxxxxxxxx are
origin.patch
spidernet-refactor-rx-refill.patch
spidernet-rx-skb-mem-leak.patch
spidernet-another-skb-mem-leak.patch
spidernet-cleanup-return-codes.patch
spidernet-rx-refill.patch
spidernet-merge-error-branches.patch
spidernet-remove-unused-variable.patch
spidernet-rx-chain-tail.patch
spidernet-turn-rx-irq-back-on.patch
spidernet-memory-barrier.patch
spidernet-avoid-possible-rx-chain-corruption.patch
spidernet-rx-debugging-printout.patch
spidernet-rework-rx-linked-list.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
