[patch 3/9] [PATCH] netiucv: invalid return code from hard_start_xmit

Ursula Braun
2009-03-24T12:29:07Z

[-- Attachment #1: 610-netiucv-rc-warning.diff --]
[-- Type: text/plain, Size: 842 bytes --]

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/netiucv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff -urpN linux-2.6/drivers/s390/net/netiucv.c linux-2.6-patched/drivers/s390/net/netiucv.c
--- linux-2.6/drivers/s390/net/netiucv.c 2009-03-04 15:58:03.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/netiucv.c 2009-03-04 15:58:30.000000000 +0100
@@ -1312,7 +1312,7 @@ static int netiucv_tx(struct sk_buff *sk

if (netiucv_test_and_set_busy(dev)) {
IUCV_DBF_TEXT(data, 2, "EBUSY from netiucv_tx\n");
- return -EBUSY;
+ return NETDEV_TX_BUSY;
}
dev->trans_start = jiffies;
rc = netiucv_transmit_skb(privptr->conn, skb) != 0;