From: Ursula Braun <ursula.braun@de.ibm.com>
Date: Tue, 24 Mar 2009 03:27:47 +0000 (+0000)
Subject: ctcm: invalid return code from hard_start_xmit
X-Git-Tag: Ubuntu-5.10.0-12.13~33938^2~40
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=3a05d1404d91efd63f0654a4bf59b8803c32efdd;p=mirror_ubuntu-hirsute-kernel.git

ctcm: invalid return code from hard_start_xmit

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>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c
index 8f2a888d0a0a..59ce7fb73089 100644
--- a/drivers/s390/net/ctcm_main.c
+++ b/drivers/s390/net/ctcm_main.c
@@ -906,11 +906,11 @@ static int ctcm_tx(struct sk_buff *skb, struct net_device *dev)
 	}
 
 	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;
 }