aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUrsula Braun <ursula.braun@de.ibm.com>2009-03-23 23:27:45 -0400
committerDavid S. Miller <davem@davemloft.net>2009-03-24 18:24:28 -0400
commit4e584d66ea60cf3d921aea78372f4e4d48a9155d (patch)
treed0290af13310d799b2561223d0ebbf39067ef9a6
parent9e669d327a873bbab51e7e95ee9f9c3c49755594 (diff)
netiucv: 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>
-rw-r--r--drivers/s390/net/netiucv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c
index 1ba4509435f8..be716e45f7ac 100644
--- a/drivers/s390/net/netiucv.c
+++ b/drivers/s390/net/netiucv.c
@@ -1312,7 +1312,7 @@ static int netiucv_tx(struct sk_buff *skb, struct net_device *dev)
1312 1312
1313 if (netiucv_test_and_set_busy(dev)) { 1313 if (netiucv_test_and_set_busy(dev)) {
1314 IUCV_DBF_TEXT(data, 2, "EBUSY from netiucv_tx\n"); 1314 IUCV_DBF_TEXT(data, 2, "EBUSY from netiucv_tx\n");
1315 return -EBUSY; 1315 return NETDEV_TX_BUSY;
1316 } 1316 }
1317 dev->trans_start = jiffies; 1317 dev->trans_start = jiffies;
1318 rc = netiucv_transmit_skb(privptr->conn, skb) != 0; 1318 rc = netiucv_transmit_skb(privptr->conn, skb) != 0;