netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ursula Braun <ursula.braun@de.ibm.com>
To: davem@davemloft.net, netdev@vger.kernel.org, linux-s390@vger.kernel.org
Cc: schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com,
	Klaus-Dieter Wacker <kdwacker@de.ibm.com>,
	Ursula Braun <ursula.braun@de.ibm.com>
Subject: [patch 2/9] [PATCH] lcs: invalid return codes from hard_start_xmit.
Date: Tue, 24 Mar 2009 14:27:44 +0100	[thread overview]
Message-ID: <20090324133048.969199000@linux.vnet.ibm.com> (raw)
In-Reply-To: 20090324132742.300929000@linux.vnet.ibm.com

[-- Attachment #1: 608-lcs-rc.diff --]
[-- Type: text/plain, Size: 1160 bytes --]

From: Klaus-Dieter Wacker <kdwacker@de.ibm.com>

Lcs hard_start_xmit routine issued return codes other than
defined for this interface. Now lcs returns only either
NETDEV_TX_OK or NETDEV_TX_BUSY.

Signed-off-by: Klaus-Dieter Wacker <kdwacker@de.ibm.com>
Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>
---

 drivers/s390/net/lcs.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff -urpN linux-2.6/drivers/s390/net/lcs.c linux-2.6-patched/drivers/s390/net/lcs.c
--- linux-2.6/drivers/s390/net/lcs.c	2009-03-04 15:58:28.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/lcs.c	2009-03-04 15:58:29.000000000 +0100
@@ -1562,7 +1562,7 @@ __lcs_start_xmit(struct lcs_card *card, 
 	if (skb == NULL) {
 		card->stats.tx_dropped++;
 		card->stats.tx_errors++;
-		return -EIO;
+		return 0;
 	}
 	if (card->state != DEV_STATE_UP) {
 		dev_kfree_skb(skb);
@@ -1587,7 +1587,7 @@ __lcs_start_xmit(struct lcs_card *card, 
 		card->tx_buffer = lcs_get_buffer(&card->write);
 		if (card->tx_buffer == NULL) {
 			card->stats.tx_dropped++;
-			rc = -EBUSY;
+			rc = NETDEV_TX_BUSY;
 			goto out;
 		}
 		card->tx_buffer->callback = lcs_txbuffer_cb;


  parent reply	other threads:[~2009-03-24 13:30 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-24 13:27 [patch 0/9] [RESEND] s390: lcs / ctcm / claw / netiucv patches for 2.6.29 Ursula Braun
2009-03-24 13:27 ` [patch 1/9] [PATCH] Use kthread instead of kernel_thread Ursula Braun
2009-03-24 13:27 ` Ursula Braun [this message]
2009-03-24 13:27 ` [patch 3/9] [PATCH] netiucv: invalid return code from hard_start_xmit Ursula Braun
2009-03-24 13:27 ` [patch 4/9] [PATCH] claw: invalid return codes " Ursula Braun
2009-03-24 13:27 ` [patch 5/9] [PATCH] ctcm: invalid return code " Ursula Braun
2009-03-24 13:27 ` [patch 6/9] [PATCH] ctcm: avoid wraparound in length of incoming data Ursula Braun
2009-03-24 13:27 ` [patch 7/9] [PATCH] ctcm: fix minor findings from code analysis tool Ursula Braun
2009-03-24 13:27 ` [patch 8/9] [PATCH] kmsg: convert claw printk messages to kmsg api Ursula Braun
2009-03-24 22:28   ` David Miller
2009-03-24 13:27 ` [patch 9/9] [PATCH] claw: fix minor findings from code analysis tool Ursula Braun
2009-03-24 22:29 ` [patch 0/9] [RESEND] s390: lcs / ctcm / claw / netiucv patches for 2.6.29 David Miller
  -- strict thread matches above, loose matches on Subject: below --
2009-03-24 12:29 [patch 0/9] " Ursula Braun
2009-03-24 12:29 ` [patch 2/9] [PATCH] lcs: invalid return codes from hard_start_xmit Ursula Braun

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=20090324133048.969199000@linux.vnet.ibm.com \
    --to=ursula.braun@de.ibm.com \
    --cc=davem@davemloft.net \
    --cc=heiko.carstens@de.ibm.com \
    --cc=kdwacker@de.ibm.com \
    --cc=linux-s390@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=schwidefsky@de.ibm.com \
    /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).