From: linas@austin.ibm.com (Linas Vepstas)
To: Andrew Morton <akpm@osdl.org>
Cc: Arnd Bergmann <arnd@arndb.de>,
netdev@vger.kernel.org, Christoph Hellwig <hch@infradead.org>,
linuxppc-dev@ozlabs.org, Jens Osterkamp <Jens.Osterkamp@gmx.de>,
jgarzik@pobox.com, James K Lewis <jim@jklewis.com>
Subject: [PATCH 7/14] Spidernet Cleanup return codes
Date: Wed, 13 Dec 2006 15:17:39 -0600 [thread overview]
Message-ID: <20061213211739.GG1915@austin.ibm.com> (raw)
In-Reply-To: <20061213210010.GR4329@austin.ibm.com>
Simplify the somewhat convoluted use of return codes
in the rx buffer handling.
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 | 32 ++++++++++++--------------------
1 file changed, 12 insertions(+), 20 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-13 14:24:20.000000000 -0600
+++ linux-2.6.19-git7/drivers/net/spider_net.c 2006-12-13 14:27:35.000000000 -0600
@@ -911,12 +911,10 @@ spider_net_do_ioctl(struct net_device *n
* @descr: descriptor to process
* @card: card structure
*
- * returns 1 on success, 0 if no packet was passed to the stack
- *
* Fills out skb structure and passes the data to the stack.
* The descriptor state is not changed.
*/
-static int
+static void
spider_net_pass_skb_up(struct spider_net_descr *descr,
struct spider_net_card *card)
{
@@ -961,8 +959,6 @@ spider_net_pass_skb_up(struct spider_net
/* update netdevice statistics */
card->netdev_stats.rx_packets++;
card->netdev_stats.rx_bytes += skb->len;
-
- return 1;
}
/**
@@ -981,7 +977,6 @@ spider_net_decode_one_descr(struct spide
struct spider_net_descr_chain *chain = &card->rx_chain;
struct spider_net_descr *descr = chain->tail;
int status;
- int result;
status = spider_net_get_descr_status(descr);
@@ -999,8 +994,6 @@ spider_net_decode_one_descr(struct spide
/* descriptor definitively used -- move on tail */
chain->tail = descr->next;
- result = 0;
-
/* unmap descriptor */
pci_unmap_single(card->pdev, descr->buf_addr,
SPIDER_NET_MAX_FRAME, PCI_DMA_FROMDEVICE);
@@ -1012,8 +1005,7 @@ spider_net_decode_one_descr(struct spide
pr_err("%s: dropping RX descriptor with state %d\n",
card->netdev->name, status);
card->netdev_stats.rx_dropped++;
- dev_kfree_skb_irq(descr->skb);
- goto refill;
+ goto bad_desc;
}
if ( (status != SPIDER_NET_DESCR_COMPLETE) &&
@@ -1022,8 +1014,7 @@ spider_net_decode_one_descr(struct spide
pr_err("%s: RX descriptor with unkown state %d\n",
card->netdev->name, status);
card->spider_stats.rx_desc_unk_state++;
- dev_kfree_skb_irq(descr->skb);
- goto refill;
+ goto bad_desc;
}
/* The cases we'll throw away the packet immediately */
@@ -1033,17 +1024,18 @@ spider_net_decode_one_descr(struct spide
"data_status=x%08x, data_error=x%08x\n",
card->netdev->name,
descr->data_status, descr->data_error);
- card->spider_stats.rx_desc_error++;
- dev_kfree_skb_irq(descr->skb);
- goto refill;
+ goto bad_desc;
}
- /* ok, we've got a packet in descr */
- result = spider_net_pass_skb_up(descr, card);
-refill:
- /* change the descriptor state: */
+ /* Ok, we've got a packet in descr */
+ spider_net_pass_skb_up(descr, card);
descr->dmac_cmd_status = SPIDER_NET_DESCR_NOT_IN_USE;
- return result;
+ return 1;
+
+bad_desc:
+ dev_kfree_skb_irq(descr->skb);
+ descr->dmac_cmd_status = SPIDER_NET_DESCR_NOT_IN_USE;
+ return 0;
}
/**
next prev parent reply other threads:[~2006-12-13 21:17 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-13 21:00 [PATCH 0/14]: Spidernet RX-side patches Linas Vepstas
2006-12-13 21:06 ` [PATCH 1/14] Spidernet DMA coalescing Linas Vepstas
2006-12-14 11:05 ` Christoph Hellwig
2006-12-14 17:07 ` Linas Vepstas
2006-12-14 17:35 ` Christoph Hellwig
2006-12-14 19:38 ` Revised: " Linas Vepstas
2006-12-26 21:09 ` Jeff Garzik
2006-12-13 21:08 ` [PATCH 2/14] Spidernet add net_ratelimit to suppress long output Linas Vepstas
2006-12-13 23:31 ` Michael Ellerman
2006-12-14 6:13 ` Jim Lewis
2006-12-13 21:10 ` [PATCH 3/14] Spidernet remove rxramfull tasklet Linas Vepstas
2006-12-13 21:12 ` [PATCH 4/14] Spidernet cleanup un-needed API Linas Vepstas
2006-12-13 21:15 ` [PATCH 5/14] Spidernet RX skb mem leak Linas Vepstas
2006-12-13 21:16 ` [PATCH 6/14] Spidernet another " Linas Vepstas
2006-12-13 21:17 ` Linas Vepstas [this message]
2006-12-13 21:18 ` [PATCH 8/14] Spidernet RX Refill Linas Vepstas
2006-12-13 21:19 ` [PATCH 9/14] Spidernet Remove unused variable Linas Vepstas
2006-12-13 21:20 ` [PATCH 10/14] Spidernet RX Chain tail Linas Vepstas
2006-12-13 21:22 ` [PATCH 11/14] Spidernet Memory barrier Linas Vepstas
2006-12-13 21:23 ` [PATCH 12/14] Spidernet Avoid possible RX chain corruption Linas Vepstas
2006-12-14 0:22 ` Michael Ellerman
2006-12-14 17:15 ` Linas Vepstas
2006-12-14 17:36 ` Christoph Hellwig
2006-12-15 1:48 ` Michael Ellerman
2006-12-13 21:23 ` [PATCH 13/14] Spidernet RX Debugging printout Linas Vepstas
2006-12-13 21:25 ` [PATCH 14/14] 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=20061213211739.GG1915@austin.ibm.com \
--to=linas@austin.ibm.com \
--cc=Jens.Osterkamp@gmx.de \
--cc=akpm@osdl.org \
--cc=arnd@arndb.de \
--cc=hch@infradead.org \
--cc=jgarzik@pobox.com \
--cc=jim@jklewis.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).