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/w83977af_ir.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/w83977af_ir.c')
-rw-r--r-- | drivers/net/irda/w83977af_ir.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/irda/w83977af_ir.c b/drivers/net/irda/w83977af_ir.c index 462bc437080f..551810fd2976 100644 --- a/drivers/net/irda/w83977af_ir.c +++ b/drivers/net/irda/w83977af_ir.c | |||
@@ -93,7 +93,8 @@ static int w83977af_close(struct w83977af_ir *self); | |||
93 | static int w83977af_probe(int iobase, int irq, int dma); | 93 | static int w83977af_probe(int iobase, int irq, int dma); |
94 | static int w83977af_dma_receive(struct w83977af_ir *self); | 94 | static int w83977af_dma_receive(struct w83977af_ir *self); |
95 | static int w83977af_dma_receive_complete(struct w83977af_ir *self); | 95 | static int w83977af_dma_receive_complete(struct w83977af_ir *self); |
96 | static int w83977af_hard_xmit(struct sk_buff *skb, struct net_device *dev); | 96 | static netdev_tx_t w83977af_hard_xmit(struct sk_buff *skb, |
97 | struct net_device *dev); | ||
97 | static int w83977af_pio_write(int iobase, __u8 *buf, int len, int fifo_size); | 98 | static int w83977af_pio_write(int iobase, __u8 *buf, int len, int fifo_size); |
98 | static void w83977af_dma_write(struct w83977af_ir *self, int iobase); | 99 | static void w83977af_dma_write(struct w83977af_ir *self, int iobase); |
99 | static void w83977af_change_speed(struct w83977af_ir *self, __u32 speed); | 100 | static void w83977af_change_speed(struct w83977af_ir *self, __u32 speed); |
@@ -490,7 +491,8 @@ static void w83977af_change_speed(struct w83977af_ir *self, __u32 speed) | |||
490 | * Sets up a DMA transfer to send the current frame. | 491 | * Sets up a DMA transfer to send the current frame. |
491 | * | 492 | * |
492 | */ | 493 | */ |
493 | static int w83977af_hard_xmit(struct sk_buff *skb, struct net_device *dev) | 494 | static netdev_tx_t w83977af_hard_xmit(struct sk_buff *skb, |
495 | struct net_device *dev) | ||
494 | { | 496 | { |
495 | struct w83977af_ir *self; | 497 | struct w83977af_ir *self; |
496 | __s32 speed; | 498 | __s32 speed; |