aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/net
diff options
context:
space:
mode:
authorUrsula Braun <ursula.braun@de.ibm.com>2009-03-23 23:27:47 -0400
committerDavid S. Miller <davem@davemloft.net>2009-03-24 18:24:30 -0400
commit3a05d1404d91efd63f0654a4bf59b8803c32efdd (patch)
tree49411819debc95fb567b9766931fd07925a8ca14 /drivers/s390/net
parent8f0c40d4b6a6207ef2105d94544a9d1c0835c4ab (diff)
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/s390/net')
-rw-r--r--drivers/s390/net/ctcm_main.c4
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)
906 } 906 }
907 907
908 if (ctcm_test_and_set_busy(dev)) 908 if (ctcm_test_and_set_busy(dev))
909 return -EBUSY; 909 return NETDEV_TX_BUSY;
910 910
911 dev->trans_start = jiffies; 911 dev->trans_start = jiffies;
912 if (ctcm_transmit_skb(priv->channel[WRITE], skb) != 0) 912 if (ctcm_transmit_skb(priv->channel[WRITE], skb) != 0)
913 return 1; 913 return NETDEV_TX_BUSY;
914 return 0; 914 return 0;
915} 915}
916 916