diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-08-31 15:50:50 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-01 04:13:38 -0400 |
commit | 6518bbb803fe02b15a3211c8db2afdff0ac4f808 (patch) | |
tree | 85b5df710063c22164150fb4fcf37098f188240a /drivers/net/irda/via-ircc.c | |
parent | dbf02fae406daf4d583a279743869c686024c341 (diff) |
irda: convert 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/irda/via-ircc.c')
-rw-r--r-- | drivers/net/irda/via-ircc.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c index 36a60748447b..a5ca71cec028 100644 --- a/drivers/net/irda/via-ircc.c +++ b/drivers/net/irda/via-ircc.c | |||
@@ -87,10 +87,10 @@ static int via_ircc_close(struct via_ircc_cb *self); | |||
87 | static int via_ircc_dma_receive(struct via_ircc_cb *self); | 87 | static int via_ircc_dma_receive(struct via_ircc_cb *self); |
88 | static int via_ircc_dma_receive_complete(struct via_ircc_cb *self, | 88 | static int via_ircc_dma_receive_complete(struct via_ircc_cb *self, |
89 | int iobase); | 89 | int iobase); |
90 | static int via_ircc_hard_xmit_sir(struct sk_buff *skb, | 90 | static netdev_tx_t via_ircc_hard_xmit_sir(struct sk_buff *skb, |
91 | struct net_device *dev); | 91 | struct net_device *dev); |
92 | static int via_ircc_hard_xmit_fir(struct sk_buff *skb, | 92 | static netdev_tx_t via_ircc_hard_xmit_fir(struct sk_buff *skb, |
93 | struct net_device *dev); | 93 | struct net_device *dev); |
94 | static void via_hw_init(struct via_ircc_cb *self); | 94 | static void via_hw_init(struct via_ircc_cb *self); |
95 | static void via_ircc_change_speed(struct via_ircc_cb *self, __u32 baud); | 95 | static void via_ircc_change_speed(struct via_ircc_cb *self, __u32 baud); |
96 | static irqreturn_t via_ircc_interrupt(int irq, void *dev_id); | 96 | static irqreturn_t via_ircc_interrupt(int irq, void *dev_id); |
@@ -823,8 +823,8 @@ static void via_ircc_change_speed(struct via_ircc_cb *self, __u32 speed) | |||
823 | * Transmit the frame! | 823 | * Transmit the frame! |
824 | * | 824 | * |
825 | */ | 825 | */ |
826 | static int via_ircc_hard_xmit_sir(struct sk_buff *skb, | 826 | static netdev_tx_t via_ircc_hard_xmit_sir(struct sk_buff *skb, |
827 | struct net_device *dev) | 827 | struct net_device *dev) |
828 | { | 828 | { |
829 | struct via_ircc_cb *self; | 829 | struct via_ircc_cb *self; |
830 | unsigned long flags; | 830 | unsigned long flags; |
@@ -895,8 +895,8 @@ static int via_ircc_hard_xmit_sir(struct sk_buff *skb, | |||
895 | return NETDEV_TX_OK; | 895 | return NETDEV_TX_OK; |
896 | } | 896 | } |
897 | 897 | ||
898 | static int via_ircc_hard_xmit_fir(struct sk_buff *skb, | 898 | static netdev_tx_t via_ircc_hard_xmit_fir(struct sk_buff *skb, |
899 | struct net_device *dev) | 899 | struct net_device *dev) |
900 | { | 900 | { |
901 | struct via_ircc_cb *self; | 901 | struct via_ircc_cb *self; |
902 | u16 iobase; | 902 | u16 iobase; |