aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wan/z85230.c
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-08-31 15:50:47 -0400
committerDavid S. Miller <davem@davemloft.net>2009-09-01 04:13:28 -0400
commitd71a674922e7519edb477ecb585e7d29d69c7aa7 (patch)
tree816f6936957d5dbe2670079f64bdbd1f52cec00d /drivers/net/wan/z85230.c
parent61a84108547c1c017683f15311ccbede249fc6fa (diff)
wan: convert drivers to netdev_tx_t
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wan/z85230.c')
-rw-r--r--drivers/net/wan/z85230.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
index ad4e79c4c5c3..0be7ec7299db 100644
--- a/drivers/net/wan/z85230.c
+++ b/drivers/net/wan/z85230.c
@@ -1727,15 +1727,14 @@ static inline int spans_boundary(struct sk_buff *skb)
1727 * point. 1727 * point.
1728 */ 1728 */
1729 1729
1730int z8530_queue_xmit(struct z8530_channel *c, struct sk_buff *skb) 1730netdev_tx_t z8530_queue_xmit(struct z8530_channel *c, struct sk_buff *skb)
1731{ 1731{
1732 unsigned long flags; 1732 unsigned long flags;
1733 1733
1734 netif_stop_queue(c->netdevice); 1734 netif_stop_queue(c->netdevice);
1735 if(c->tx_next_skb) 1735 if(c->tx_next_skb)
1736 { 1736 return NETDEV_TX_BUSY;
1737 return 1; 1737
1738 }
1739 1738
1740 /* PC SPECIFIC - DMA limits */ 1739 /* PC SPECIFIC - DMA limits */
1741 1740
@@ -1767,7 +1766,7 @@ int z8530_queue_xmit(struct z8530_channel *c, struct sk_buff *skb)
1767 z8530_tx_begin(c); 1766 z8530_tx_begin(c);
1768 spin_unlock_irqrestore(c->lock, flags); 1767 spin_unlock_irqrestore(c->lock, flags);
1769 1768
1770 return 0; 1769 return NETDEV_TX_OK;
1771} 1770}
1772 1771
1773EXPORT_SYMBOL(z8530_queue_xmit); 1772EXPORT_SYMBOL(z8530_queue_xmit);