diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-08-31 15:50:47 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-01 04:13:28 -0400 |
commit | d71a674922e7519edb477ecb585e7d29d69c7aa7 (patch) | |
tree | 816f6936957d5dbe2670079f64bdbd1f52cec00d /drivers/net/wan/cosa.c | |
parent | 61a84108547c1c017683f15311ccbede249fc6fa (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/cosa.c')
-rw-r--r-- | drivers/net/wan/cosa.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c index 61581ee5f08c..66360a2a14c2 100644 --- a/drivers/net/wan/cosa.c +++ b/drivers/net/wan/cosa.c | |||
@@ -279,7 +279,7 @@ static int cosa_net_attach(struct net_device *dev, unsigned short encoding, | |||
279 | static int cosa_net_open(struct net_device *d); | 279 | static int cosa_net_open(struct net_device *d); |
280 | static int cosa_net_close(struct net_device *d); | 280 | static int cosa_net_close(struct net_device *d); |
281 | static void cosa_net_timeout(struct net_device *d); | 281 | static void cosa_net_timeout(struct net_device *d); |
282 | static int cosa_net_tx(struct sk_buff *skb, struct net_device *d); | 282 | static netdev_tx_t cosa_net_tx(struct sk_buff *skb, struct net_device *d); |
283 | static char *cosa_net_setup_rx(struct channel_data *channel, int size); | 283 | static char *cosa_net_setup_rx(struct channel_data *channel, int size); |
284 | static int cosa_net_rx_done(struct channel_data *channel); | 284 | static int cosa_net_rx_done(struct channel_data *channel); |
285 | static int cosa_net_tx_done(struct channel_data *channel, int size); | 285 | static int cosa_net_tx_done(struct channel_data *channel, int size); |
@@ -672,7 +672,8 @@ static int cosa_net_open(struct net_device *dev) | |||
672 | return 0; | 672 | return 0; |
673 | } | 673 | } |
674 | 674 | ||
675 | static int cosa_net_tx(struct sk_buff *skb, struct net_device *dev) | 675 | static netdev_tx_t cosa_net_tx(struct sk_buff *skb, |
676 | struct net_device *dev) | ||
676 | { | 677 | { |
677 | struct channel_data *chan = dev_to_chan(dev); | 678 | struct channel_data *chan = dev_to_chan(dev); |
678 | 679 | ||
@@ -680,7 +681,7 @@ static int cosa_net_tx(struct sk_buff *skb, struct net_device *dev) | |||
680 | 681 | ||
681 | chan->tx_skb = skb; | 682 | chan->tx_skb = skb; |
682 | cosa_start_tx(chan, skb->data, skb->len); | 683 | cosa_start_tx(chan, skb->data, skb->len); |
683 | return 0; | 684 | return NETDEV_TX_OK; |
684 | } | 685 | } |
685 | 686 | ||
686 | static void cosa_net_timeout(struct net_device *dev) | 687 | static void cosa_net_timeout(struct net_device *dev) |