Home » Mailing list archives » linux-netdev » 2009 » March » 24

[patch 5/9] [PATCH] ctcm: invalid return code from hard_start_xmit

Previous thread: [patch 6/9] [PATCH] ctcm: avoid wraparound in length of incoming data by Ursula Braun on Tuesday, March 24, 2009 - 5:29 am. (1 message)

Next thread: [patch 3/9] [PATCH] netiucv: invalid return code from hard_start_xmit by Ursula Braun on Tuesday, March 24, 2009 - 5:29 am. (1 message)
[view original message]
From: Ursula Braun
Subject: [patch 5/9] [PATCH] ctcm: invalid return code from hard_start_xmit
Date: Tuesday, March 24, 2009 - 5:29 am

From: Ursula Braun <ursula.braun@de.ibm.com>

Avoid kernel warning by using the correct hard_start_xmit return
code NETDEV_TX_BUSY for skb requeuing.

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

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

diff -urpN linux-2.6/drivers/s390/net/ctcm_main.c linux-2.6-patched/drivers/s390/net/ctcm_main.c
--- linux-2.6/drivers/s390/net/ctcm_main.c	2009-03-04 15:58:03.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/ctcm_main.c	2009-03-04 15:58:31.000000000 +0100
@@ -906,11 +906,11 @@ static int ctcm_tx(struct sk_buff *skb, 
 	}
 
 	if (ctcm_test_and_set_busy(dev))
-		return -EBUSY;
+		return NETDEV_TX_BUSY;
 
 	dev->trans_start = jiffies;
 	if (ctcm_transmit_skb(priv->channel[WRITE], skb) != 0)
-		return 1;
+		return NETDEV_TX_BUSY;
 	return 0;
 }
 

--


[ message continues ]
Previous thread: [patch 6/9] [PATCH] ctcm: avoid wraparound in length of incoming data by Ursula Braun on Tuesday, March 24, 2009 - 5:29 am. (1 message)

Next thread: [patch 3/9] [PATCH] netiucv: invalid return code from hard_start_xmit by Ursula Braun on Tuesday, March 24, 2009 - 5:29 am. (1 message)