diff options
author | Ursula Braun <ursula.braun@de.ibm.com> | 2009-03-24 03:27:47 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-24 15:24:30 -0700 |
commit | 3a05d1404d91efd63f0654a4bf59b8803c32efdd (patch) | |
tree | 49411819debc95fb567b9766931fd07925a8ca14 /drivers | |
parent | 8f0c40d4b6a6207ef2105d94544a9d1c0835c4ab (diff) | |
download | blackbird-op-linux-3a05d1404d91efd63f0654a4bf59b8803c32efdd.tar.gz blackbird-op-linux-3a05d1404d91efd63f0654a4bf59b8803c32efdd.zip |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/s390/net/ctcm_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |