diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2009-08-31 19:50:47 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-01 01:13:28 -0700 |
| commit | d71a674922e7519edb477ecb585e7d29d69c7aa7 (patch) | |
| tree | 816f6936957d5dbe2670079f64bdbd1f52cec00d /drivers/net/wan/z85230.c | |
| parent | 61a84108547c1c017683f15311ccbede249fc6fa (diff) | |
| download | op-kernel-dev-d71a674922e7519edb477ecb585e7d29d69c7aa7.zip op-kernel-dev-d71a674922e7519edb477ecb585e7d29d69c7aa7.tar.gz | |
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.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c index ad4e79c..0be7ec7 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) * point. */ -int z8530_queue_xmit(struct z8530_channel *c, struct sk_buff *skb) +netdev_tx_t z8530_queue_xmit(struct z8530_channel *c, struct sk_buff *skb) { unsigned long flags; netif_stop_queue(c->netdevice); if(c->tx_next_skb) - { - return 1; - } + return NETDEV_TX_BUSY; + /* PC SPECIFIC - DMA limits */ @@ -1767,7 +1766,7 @@ int z8530_queue_xmit(struct z8530_channel *c, struct sk_buff *skb) z8530_tx_begin(c); spin_unlock_irqrestore(c->lock, flags); - return 0; + return NETDEV_TX_OK; } EXPORT_SYMBOL(z8530_queue_xmit); |
