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/net/tokenring | |
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/net/tokenring')
-rw-r--r-- | drivers/net/tokenring/3c359.c | 2 | ||||
-rw-r--r-- | drivers/net/tokenring/ibmtr.c | 2 | ||||
-rw-r--r-- | drivers/net/tokenring/lanstreamer.c | 2 | ||||
-rw-r--r-- | drivers/net/tokenring/olympic.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c index b40b6de2d086..1787d52941bc 100644 --- a/drivers/net/tokenring/3c359.c +++ b/drivers/net/tokenring/3c359.c | |||
@@ -1240,7 +1240,7 @@ static int xl_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1240 | 1240 | ||
1241 | spin_unlock_irqrestore(&xl_priv->xl_lock,flags) ; | 1241 | spin_unlock_irqrestore(&xl_priv->xl_lock,flags) ; |
1242 | 1242 | ||
1243 | return 0; | 1243 | return NETDEV_TX_OK; |
1244 | } else { | 1244 | } else { |
1245 | spin_unlock_irqrestore(&xl_priv->xl_lock,flags) ; | 1245 | spin_unlock_irqrestore(&xl_priv->xl_lock,flags) ; |
1246 | return NETDEV_TX_BUSY; | 1246 | return NETDEV_TX_BUSY; |
diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c index 9d896116cf76..6472ba5cfc5e 100644 --- a/drivers/net/tokenring/ibmtr.c +++ b/drivers/net/tokenring/ibmtr.c | |||
@@ -1041,7 +1041,7 @@ static int tok_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
1041 | writeb(CMD_IN_SRB, ti->mmio + ACA_OFFSET + ACA_SET + ISRA_ODD); | 1041 | writeb(CMD_IN_SRB, ti->mmio + ACA_OFFSET + ACA_SET + ISRA_ODD); |
1042 | spin_unlock_irqrestore(&(ti->lock), flags); | 1042 | spin_unlock_irqrestore(&(ti->lock), flags); |
1043 | dev->trans_start = jiffies; | 1043 | dev->trans_start = jiffies; |
1044 | return 0; | 1044 | return NETDEV_TX_OK; |
1045 | } | 1045 | } |
1046 | 1046 | ||
1047 | /*****************************************************************************/ | 1047 | /*****************************************************************************/ |
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c index b3715efdce56..d07e61a9499e 100644 --- a/drivers/net/tokenring/lanstreamer.c +++ b/drivers/net/tokenring/lanstreamer.c | |||
@@ -1183,7 +1183,7 @@ static int streamer_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1183 | 1183 | ||
1184 | streamer_priv->tx_ring_free = (streamer_priv->tx_ring_free + 1) & (STREAMER_TX_RING_SIZE - 1); | 1184 | streamer_priv->tx_ring_free = (streamer_priv->tx_ring_free + 1) & (STREAMER_TX_RING_SIZE - 1); |
1185 | spin_unlock_irqrestore(&streamer_priv->streamer_lock,flags); | 1185 | spin_unlock_irqrestore(&streamer_priv->streamer_lock,flags); |
1186 | return 0; | 1186 | return NETDEV_TX_OK; |
1187 | } else { | 1187 | } else { |
1188 | netif_stop_queue(dev); | 1188 | netif_stop_queue(dev); |
1189 | spin_unlock_irqrestore(&streamer_priv->streamer_lock,flags); | 1189 | spin_unlock_irqrestore(&streamer_priv->streamer_lock,flags); |
diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c index 451b54136ede..f73f4e684f33 100644 --- a/drivers/net/tokenring/olympic.c +++ b/drivers/net/tokenring/olympic.c | |||
@@ -1052,7 +1052,7 @@ static int olympic_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1052 | writew((((readw(olympic_mmio+TXENQ_1)) & 0x8000) ^ 0x8000) | 1,olympic_mmio+TXENQ_1); | 1052 | writew((((readw(olympic_mmio+TXENQ_1)) & 0x8000) ^ 0x8000) | 1,olympic_mmio+TXENQ_1); |
1053 | netif_wake_queue(dev); | 1053 | netif_wake_queue(dev); |
1054 | spin_unlock_irqrestore(&olympic_priv->olympic_lock,flags); | 1054 | spin_unlock_irqrestore(&olympic_priv->olympic_lock,flags); |
1055 | return 0; | 1055 | return NETDEV_TX_OK; |
1056 | } else { | 1056 | } else { |
1057 | spin_unlock_irqrestore(&olympic_priv->olympic_lock,flags); | 1057 | spin_unlock_irqrestore(&olympic_priv->olympic_lock,flags); |
1058 | return NETDEV_TX_BUSY; | 1058 | return NETDEV_TX_BUSY; |