From: Stephen Hemminger <shemminger@vyatta.com>
To: David Miller <davem@davemloft.net>,
Robert Olsson <robert.olsson@its.uu.se>
Cc: netdev@vger.kernel.org, Thomas Gleixner <tglx@linutronix.de>
Subject: [PATCH 08/14] pktgen: reorganize transmit loop
Date: Thu, 27 Aug 2009 16:55:14 -0700 [thread overview]
Message-ID: <20090827235705.740919364@vyatta.com> (raw)
In-Reply-To: 20090827235506.624381734@vyatta.com
[-- Attachment #1: pktgen-reorg2.patch --]
[-- Type: text/plain, Size: 1448 bytes --]
Handle standard (and non-standard) return values in a switch.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
---
net/core/pktgen.c | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
--- a/net/core/pktgen.c 2009-08-27 11:45:40.162808571 -0700
+++ b/net/core/pktgen.c 2009-08-27 11:56:46.356874524 -0700
@@ -3424,27 +3424,29 @@ static void pktgen_xmit(struct pktgen_de
pkt_dev->last_ok = 0;
else {
atomic_inc(&(pkt_dev->skb->users));
- retry_now:
+
+ retry_now:
ret = (*xmit)(pkt_dev->skb, odev);
- if (likely(ret == NETDEV_TX_OK)) {
+ switch (ret) {
+ case NETDEV_TX_OK:
txq_trans_update(txq);
pkt_dev->last_ok = 1;
pkt_dev->sofar++;
pkt_dev->seq_num++;
pkt_dev->tx_bytes += pkt_dev->cur_pkt_size;
-
- } else if (ret == NETDEV_TX_LOCKED
- && (odev->features & NETIF_F_LLTX)) {
+ break;
+ case NETDEV_TX_LOCKED:
cpu_relax();
goto retry_now;
- } else { /* Retry it next time */
-
- atomic_dec(&(pkt_dev->skb->users));
-
- if (debug && net_ratelimit())
- printk(KERN_INFO "pktgen: Hard xmit error\n");
-
+ default: /* Drivers are not supposed to return other values! */
+ if (net_ratelimit())
+ pr_info("pktgen: %s xmit error: %d\n",
+ odev->name, ret);
pkt_dev->errors++;
+ /* fallthru */
+ case NETDEV_TX_BUSY:
+ /* Retry it next time */
+ atomic_dec(&(pkt_dev->skb->users));
pkt_dev->last_ok = 0;
}
--
next prev parent reply other threads:[~2009-08-27 23:59 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-27 23:55 [PATCH 00/14] pktgen update for net-next (2.6.32) Stephen Hemminger
2009-08-27 23:55 ` [PATCH 01/14] pktgen: minor cleanup Stephen Hemminger
2009-08-27 23:55 ` [PATCH 02/14] pktgen: change inlining Stephen Hemminger
2009-08-27 23:55 ` [PATCH 03/14] pktgen: mark read-only/mostly variables Stephen Hemminger
2009-08-27 23:55 ` [PATCH 04/14] pktgen: stop_device cleanup Stephen Hemminger
2009-08-27 23:55 ` [PATCH 05/14] pktgen: xmit logic reorganization Stephen Hemminger
2009-08-27 23:55 ` [PATCH 06/14] pktgen: cleanup clone count test Stephen Hemminger
2009-08-27 23:55 ` [PATCH 07/14] pktgen: use netdev_alloc_skb Stephen Hemminger
2009-08-27 23:55 ` Stephen Hemminger [this message]
2009-08-28 3:52 ` [PATCH 08/14] pktgen: reorganize transmit loop Ben Greear
2009-08-28 5:49 ` Stephen Hemminger
2009-08-28 16:01 ` Ben Greear
2009-08-29 6:04 ` David Miller
2009-09-01 21:30 ` Stephen Hemminger
2009-09-02 13:06 ` Patrick McHardy
2009-08-27 23:55 ` [PATCH 09/14] pktgen: avoid calling gettimeofday Stephen Hemminger
2009-08-27 23:55 ` [PATCH 10/14] pktgen: convert to use ktime_t Stephen Hemminger
2009-08-27 23:55 ` [PATCH 11/14] pktgen: spin using hrtimer Stephen Hemminger
2009-08-27 23:55 ` [PATCH 12/14] pktgen: use common idle routine Stephen Hemminger
2009-08-27 23:55 ` [PATCH 13/14] pktgen: cleanup checkpatch warnings Stephen Hemminger
2009-08-27 23:55 ` [PATCH 14/14] pktgen: increase version Stephen Hemminger
2009-08-29 6:33 ` [PATCH 00/14] pktgen update for net-next (2.6.32) David Miller
2009-08-29 6:42 ` David Miller
2009-09-08 11:52 ` robert
2009-09-08 12:21 ` Jesper Dangaard Brouer
2009-09-08 15:41 ` robert
2009-09-09 7:53 ` Jesper Dangaard Brouer
2009-09-11 14:29 ` Jesper Dangaard Brouer
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=20090827235705.740919364@vyatta.com \
--to=shemminger@vyatta.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=robert.olsson@its.uu.se \
--cc=tglx@linutronix.de \
/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).