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>
This commit is contained in:
committed by
David S. Miller
parent
0e8635a8e1
commit
6ed106549d
@ -1240,7 +1240,7 @@ static int xl_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
|
||||
spin_unlock_irqrestore(&xl_priv->xl_lock,flags) ;
|
||||
|
||||
return 0;
|
||||
return NETDEV_TX_OK;
|
||||
} else {
|
||||
spin_unlock_irqrestore(&xl_priv->xl_lock,flags) ;
|
||||
return NETDEV_TX_BUSY;
|
||||
|
@ -1041,7 +1041,7 @@ static int tok_send_packet(struct sk_buff *skb, struct net_device *dev)
|
||||
writeb(CMD_IN_SRB, ti->mmio + ACA_OFFSET + ACA_SET + ISRA_ODD);
|
||||
spin_unlock_irqrestore(&(ti->lock), flags);
|
||||
dev->trans_start = jiffies;
|
||||
return 0;
|
||||
return NETDEV_TX_OK;
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -1183,7 +1183,7 @@ static int streamer_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
|
||||
streamer_priv->tx_ring_free = (streamer_priv->tx_ring_free + 1) & (STREAMER_TX_RING_SIZE - 1);
|
||||
spin_unlock_irqrestore(&streamer_priv->streamer_lock,flags);
|
||||
return 0;
|
||||
return NETDEV_TX_OK;
|
||||
} else {
|
||||
netif_stop_queue(dev);
|
||||
spin_unlock_irqrestore(&streamer_priv->streamer_lock,flags);
|
||||
|
@ -1052,7 +1052,7 @@ static int olympic_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
writew((((readw(olympic_mmio+TXENQ_1)) & 0x8000) ^ 0x8000) | 1,olympic_mmio+TXENQ_1);
|
||||
netif_wake_queue(dev);
|
||||
spin_unlock_irqrestore(&olympic_priv->olympic_lock,flags);
|
||||
return 0;
|
||||
return NETDEV_TX_OK;
|
||||
} else {
|
||||
spin_unlock_irqrestore(&olympic_priv->olympic_lock,flags);
|
||||
return NETDEV_TX_BUSY;
|
||||
|
Reference in New Issue
Block a user