linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: linas@austin.ibm.com (Linas Vepstas)
To: Andrew Morton <akpm@osdl.org>
Cc: Arnd Bergmann <arnd@arndb.de>,
	netdev@vger.kernel.org, James K Lewis <jklewis@us.ibm.com>,
	linuxppc-dev@ozlabs.org, jgarzik@pobox.com
Subject: [PATCH 4/16] Spidernet Refactor RX refill
Date: Wed, 6 Dec 2006 17:33:16 -0600	[thread overview]
Message-ID: <20061206233316.GD4649@austin.ibm.com> (raw)
In-Reply-To: <20061206223223.GH17931@austin.ibm.com>


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@austin.ibm.com>
Cc: James K Lewis <jklewis@us.ibm.com>
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);

  parent reply	other threads:[~2006-12-06 23:33 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-12-06 22:32 [PATCH 0/16] Spidernet RX Misc cleanups and fixes Linas Vepstas
2006-12-06 23:27 ` [PATCH 1/16] Spidernet DMA coalescing Linas Vepstas
2006-12-07  7:08   ` Andrew Morton
2006-12-07 17:16     ` Linas Vepstas
2006-12-08  2:12       ` Mail forwarding loop (was: Re: [PATCH 1/16] Spidernet DMA coalescing) Stephen Rothwell
2006-12-07 10:11   ` [PATCH 1/16] Spidernet DMA coalescing Christoph Hellwig
2006-12-13 17:27     ` Linas Vepstas
2006-12-06 23:29 ` [PATCH 2/16] Spidernet add net_ratelimit to suppress long output Linas Vepstas
2006-12-06 23:31 ` [PATCH 3/16] Spidernet RX Locking Linas Vepstas
2006-12-07 10:09   ` Jeff Garzik
2006-12-07 17:50     ` Linas Vepstas
2006-12-08 22:47       ` Benjamin Herrenschmidt
2006-12-11 21:07         ` Linas Vepstas
2006-12-06 23:33 ` Linas Vepstas [this message]
2006-12-06 23:34 ` [PATCH 5/16] Spidernet RX skb mem leak Linas Vepstas
2006-12-06 23:36 ` [PATCH 6/16] Spidernet another " Linas Vepstas
2006-12-06 23:37 ` [PATCH 7/16] Spidernet Cleanup return codes Linas Vepstas
2006-12-06 23:39 ` [PATCH 8/16] Spidernet RX Refill Linas Vepstas
2006-12-06 23:40 ` [PATCH 9/16] Spidernet Merge error branches Linas Vepstas
2006-12-06 23:41 ` [PATCH 10/16] Spidernet Remove unused variable Linas Vepstas
2006-12-06 23:42 ` [PATCH 11/16] Spidernet RX Chain tail Linas Vepstas
2006-12-06 23:43 ` [PATCH 12/16] Spidernet Turn RX irq back on Linas Vepstas
2006-12-06 23:45 ` [PATCH 13/16] Spidernet Memory barrier Linas Vepstas
2006-12-06 23:46 ` [PATCH 14/16] Spidernet Avoid possible RX chain corruption Linas Vepstas
2006-12-06 23:49 ` [PATCH 15/16] Spidernet RX Debugging printout Linas Vepstas
2006-12-06 23:51 ` [PATCH 16/16] Spidernet Rework RX linked list Linas Vepstas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20061206233316.GD4649@austin.ibm.com \
    --to=linas@austin.ibm.com \
    --cc=akpm@osdl.org \
    --cc=arnd@arndb.de \
    --cc=jgarzik@pobox.com \
    --cc=jklewis@us.ibm.com \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).