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/cycx_x25.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/cycx_x25.c')
-rw-r--r-- | drivers/net/wan/cycx_x25.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wan/cycx_x25.c b/drivers/net/wan/cycx_x25.c index 4ae9bd297cc2..2573c18b6aa5 100644 --- a/drivers/net/wan/cycx_x25.c +++ b/drivers/net/wan/cycx_x25.c | |||
@@ -139,8 +139,8 @@ static int cycx_netdevice_hard_header(struct sk_buff *skb, | |||
139 | const void *daddr, const void *saddr, | 139 | const void *daddr, const void *saddr, |
140 | unsigned len); | 140 | unsigned len); |
141 | static int cycx_netdevice_rebuild_header(struct sk_buff *skb); | 141 | static int cycx_netdevice_rebuild_header(struct sk_buff *skb); |
142 | static int cycx_netdevice_hard_start_xmit(struct sk_buff *skb, | 142 | static netdev_tx_t cycx_netdevice_hard_start_xmit(struct sk_buff *skb, |
143 | struct net_device *dev); | 143 | struct net_device *dev); |
144 | 144 | ||
145 | static struct net_device_stats * | 145 | static struct net_device_stats * |
146 | cycx_netdevice_get_stats(struct net_device *dev); | 146 | cycx_netdevice_get_stats(struct net_device *dev); |
@@ -593,8 +593,8 @@ static int cycx_netdevice_rebuild_header(struct sk_buff *skb) | |||
593 | * bottom half" (with interrupts enabled). | 593 | * bottom half" (with interrupts enabled). |
594 | * 2. Setting tbusy flag will inhibit further transmit requests from the | 594 | * 2. Setting tbusy flag will inhibit further transmit requests from the |
595 | * protocol stack and can be used for flow control with protocol layer. */ | 595 | * protocol stack and can be used for flow control with protocol layer. */ |
596 | static int cycx_netdevice_hard_start_xmit(struct sk_buff *skb, | 596 | static netdev_tx_t cycx_netdevice_hard_start_xmit(struct sk_buff *skb, |
597 | struct net_device *dev) | 597 | struct net_device *dev) |
598 | { | 598 | { |
599 | struct cycx_x25_channel *chan = netdev_priv(dev); | 599 | struct cycx_x25_channel *chan = netdev_priv(dev); |
600 | struct cycx_device *card = chan->card; | 600 | struct cycx_device *card = chan->card; |