diff options
author | Patrick McHardy <kaber@trash.net> | 2009-06-23 02:03:08 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-07-05 22:16:04 -0400 |
commit | 6ed106549d17474ca17a16057f4c0ed4eba5a7ca (patch) | |
tree | b98c09081509b3a9757339b6b66779e4126dfa29 /drivers/s390/net/ctcm_main.c | |
parent | 0e8635a8e1f2d4a9e1bfc6c3b21419a5921e674f (diff) |
net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions
This patch is the result of an automatic spatch transformation to convert
all ndo_start_xmit() return values of 0 to NETDEV_TX_OK.
Some occurences are missed by the automatic conversion, those will be
handled in a seperate patch.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390/net/ctcm_main.c')
-rw-r--r-- | drivers/s390/net/ctcm_main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c index 222e47394437..38b5079f1599 100644 --- a/drivers/s390/net/ctcm_main.c +++ b/drivers/s390/net/ctcm_main.c | |||
@@ -880,7 +880,7 @@ static int ctcm_tx(struct sk_buff *skb, struct net_device *dev) | |||
880 | "%s(%s): NULL sk_buff passed", | 880 | "%s(%s): NULL sk_buff passed", |
881 | CTCM_FUNTAIL, dev->name); | 881 | CTCM_FUNTAIL, dev->name); |
882 | priv->stats.tx_dropped++; | 882 | priv->stats.tx_dropped++; |
883 | return 0; | 883 | return NETDEV_TX_OK; |
884 | } | 884 | } |
885 | if (skb_headroom(skb) < (LL_HEADER_LENGTH + 2)) { | 885 | if (skb_headroom(skb) < (LL_HEADER_LENGTH + 2)) { |
886 | CTCM_DBF_TEXT_(ERROR, CTC_DBF_ERROR, | 886 | CTCM_DBF_TEXT_(ERROR, CTC_DBF_ERROR, |
@@ -888,7 +888,7 @@ static int ctcm_tx(struct sk_buff *skb, struct net_device *dev) | |||
888 | CTCM_FUNTAIL, dev->name, LL_HEADER_LENGTH + 2); | 888 | CTCM_FUNTAIL, dev->name, LL_HEADER_LENGTH + 2); |
889 | dev_kfree_skb(skb); | 889 | dev_kfree_skb(skb); |
890 | priv->stats.tx_dropped++; | 890 | priv->stats.tx_dropped++; |
891 | return 0; | 891 | return NETDEV_TX_OK; |
892 | } | 892 | } |
893 | 893 | ||
894 | /* | 894 | /* |
@@ -901,7 +901,7 @@ static int ctcm_tx(struct sk_buff *skb, struct net_device *dev) | |||
901 | priv->stats.tx_dropped++; | 901 | priv->stats.tx_dropped++; |
902 | priv->stats.tx_errors++; | 902 | priv->stats.tx_errors++; |
903 | priv->stats.tx_carrier_errors++; | 903 | priv->stats.tx_carrier_errors++; |
904 | return 0; | 904 | return NETDEV_TX_OK; |
905 | } | 905 | } |
906 | 906 | ||
907 | if (ctcm_test_and_set_busy(dev)) | 907 | if (ctcm_test_and_set_busy(dev)) |
@@ -910,7 +910,7 @@ static int ctcm_tx(struct sk_buff *skb, struct net_device *dev) | |||
910 | dev->trans_start = jiffies; | 910 | dev->trans_start = jiffies; |
911 | if (ctcm_transmit_skb(priv->channel[WRITE], skb) != 0) | 911 | if (ctcm_transmit_skb(priv->channel[WRITE], skb) != 0) |
912 | return NETDEV_TX_BUSY; | 912 | return NETDEV_TX_BUSY; |
913 | return 0; | 913 | return NETDEV_TX_OK; |
914 | } | 914 | } |
915 | 915 | ||
916 | /* unmerged MPC variant of ctcm_tx */ | 916 | /* unmerged MPC variant of ctcm_tx */ |
@@ -1008,7 +1008,7 @@ done: | |||
1008 | if (do_debug) | 1008 | if (do_debug) |
1009 | MPC_DBF_DEV_NAME(TRACE, dev, "exit"); | 1009 | MPC_DBF_DEV_NAME(TRACE, dev, "exit"); |
1010 | 1010 | ||
1011 | return 0; /* handle freeing of skb here */ | 1011 | return NETDEV_TX_OK; /* handle freeing of skb here */ |
1012 | } | 1012 | } |
1013 | 1013 | ||
1014 | 1014 | ||