ctcm: invalid return code from hard_start_xmit
authorUrsula Braun <ursula.braun@de.ibm.com>
Tue, 24 Mar 2009 03:27:47 +0000 (03:27 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 24 Mar 2009 22:24:30 +0000 (15:24 -0700)
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>
drivers/s390/net/ctcm_main.c

index 8f2a888..59ce7fb 100644 (file)
@@ -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;
 }