aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/irda/nsc-ircc.c
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-08-31 15:50:50 -0400
committerDavid S. Miller <davem@davemloft.net>2009-09-01 04:13:38 -0400
commit6518bbb803fe02b15a3211c8db2afdff0ac4f808 (patch)
tree85b5df710063c22164150fb4fcf37098f188240a /drivers/net/irda/nsc-ircc.c
parentdbf02fae406daf4d583a279743869c686024c341 (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/nsc-ircc.c')
-rw-r--r--drivers/net/irda/nsc-ircc.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c
index 51ca89c9a0ba..2413295ebd90 100644
--- a/drivers/net/irda/nsc-ircc.c
+++ b/drivers/net/irda/nsc-ircc.c
@@ -173,8 +173,10 @@ static int nsc_ircc_setup(chipio_t *info);
173static void nsc_ircc_pio_receive(struct nsc_ircc_cb *self); 173static void nsc_ircc_pio_receive(struct nsc_ircc_cb *self);
174static int nsc_ircc_dma_receive(struct nsc_ircc_cb *self); 174static int nsc_ircc_dma_receive(struct nsc_ircc_cb *self);
175static int nsc_ircc_dma_receive_complete(struct nsc_ircc_cb *self, int iobase); 175static int nsc_ircc_dma_receive_complete(struct nsc_ircc_cb *self, int iobase);
176static int nsc_ircc_hard_xmit_sir(struct sk_buff *skb, struct net_device *dev); 176static netdev_tx_t nsc_ircc_hard_xmit_sir(struct sk_buff *skb,
177static int nsc_ircc_hard_xmit_fir(struct sk_buff *skb, struct net_device *dev); 177 struct net_device *dev);
178static netdev_tx_t nsc_ircc_hard_xmit_fir(struct sk_buff *skb,
179 struct net_device *dev);
178static int nsc_ircc_pio_write(int iobase, __u8 *buf, int len, int fifo_size); 180static int nsc_ircc_pio_write(int iobase, __u8 *buf, int len, int fifo_size);
179static void nsc_ircc_dma_xmit(struct nsc_ircc_cb *self, int iobase); 181static void nsc_ircc_dma_xmit(struct nsc_ircc_cb *self, int iobase);
180static __u8 nsc_ircc_change_speed(struct nsc_ircc_cb *self, __u32 baud); 182static __u8 nsc_ircc_change_speed(struct nsc_ircc_cb *self, __u32 baud);
@@ -1355,7 +1357,8 @@ static __u8 nsc_ircc_change_speed(struct nsc_ircc_cb *self, __u32 speed)
1355 * Transmit the frame! 1357 * Transmit the frame!
1356 * 1358 *
1357 */ 1359 */
1358static int nsc_ircc_hard_xmit_sir(struct sk_buff *skb, struct net_device *dev) 1360static netdev_tx_t nsc_ircc_hard_xmit_sir(struct sk_buff *skb,
1361 struct net_device *dev)
1359{ 1362{
1360 struct nsc_ircc_cb *self; 1363 struct nsc_ircc_cb *self;
1361 unsigned long flags; 1364 unsigned long flags;
@@ -1427,7 +1430,8 @@ static int nsc_ircc_hard_xmit_sir(struct sk_buff *skb, struct net_device *dev)
1427 return NETDEV_TX_OK; 1430 return NETDEV_TX_OK;
1428} 1431}
1429 1432
1430static int nsc_ircc_hard_xmit_fir(struct sk_buff *skb, struct net_device *dev) 1433static netdev_tx_t nsc_ircc_hard_xmit_fir(struct sk_buff *skb,
1434 struct net_device *dev)
1431{ 1435{
1432 struct nsc_ircc_cb *self; 1436 struct nsc_ircc_cb *self;
1433 unsigned long flags; 1437 unsigned long flags;