aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/irda/ali-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/ali-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/ali-ircc.c')
-rw-r--r--drivers/net/irda/ali-ircc.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c
index f0d0cea6e329..12c7b006f767 100644
--- a/drivers/net/irda/ali-ircc.c
+++ b/drivers/net/irda/ali-ircc.c
@@ -111,7 +111,8 @@ static int ali_ircc_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd
111static void ali_ircc_change_speed(struct ali_ircc_cb *self, __u32 baud); 111static void ali_ircc_change_speed(struct ali_ircc_cb *self, __u32 baud);
112 112
113/* SIR function */ 113/* SIR function */
114static int ali_ircc_sir_hard_xmit(struct sk_buff *skb, struct net_device *dev); 114static netdev_tx_t ali_ircc_sir_hard_xmit(struct sk_buff *skb,
115 struct net_device *dev);
115static irqreturn_t ali_ircc_sir_interrupt(struct ali_ircc_cb *self); 116static irqreturn_t ali_ircc_sir_interrupt(struct ali_ircc_cb *self);
116static void ali_ircc_sir_receive(struct ali_ircc_cb *self); 117static void ali_ircc_sir_receive(struct ali_ircc_cb *self);
117static void ali_ircc_sir_write_wakeup(struct ali_ircc_cb *self); 118static void ali_ircc_sir_write_wakeup(struct ali_ircc_cb *self);
@@ -119,7 +120,8 @@ static int ali_ircc_sir_write(int iobase, int fifo_size, __u8 *buf, int len);
119static void ali_ircc_sir_change_speed(struct ali_ircc_cb *priv, __u32 speed); 120static void ali_ircc_sir_change_speed(struct ali_ircc_cb *priv, __u32 speed);
120 121
121/* FIR function */ 122/* FIR function */
122static int ali_ircc_fir_hard_xmit(struct sk_buff *skb, struct net_device *dev); 123static netdev_tx_t ali_ircc_fir_hard_xmit(struct sk_buff *skb,
124 struct net_device *dev);
123static void ali_ircc_fir_change_speed(struct ali_ircc_cb *priv, __u32 speed); 125static void ali_ircc_fir_change_speed(struct ali_ircc_cb *priv, __u32 speed);
124static irqreturn_t ali_ircc_fir_interrupt(struct ali_ircc_cb *self); 126static irqreturn_t ali_ircc_fir_interrupt(struct ali_ircc_cb *self);
125static int ali_ircc_dma_receive(struct ali_ircc_cb *self); 127static int ali_ircc_dma_receive(struct ali_ircc_cb *self);
@@ -1435,7 +1437,8 @@ static int ali_ircc_net_close(struct net_device *dev)
1435 * Transmit the frame 1437 * Transmit the frame
1436 * 1438 *
1437 */ 1439 */
1438static int ali_ircc_fir_hard_xmit(struct sk_buff *skb, struct net_device *dev) 1440static netdev_tx_t ali_ircc_fir_hard_xmit(struct sk_buff *skb,
1441 struct net_device *dev)
1439{ 1442{
1440 struct ali_ircc_cb *self; 1443 struct ali_ircc_cb *self;
1441 unsigned long flags; 1444 unsigned long flags;
@@ -1957,7 +1960,8 @@ static int ali_ircc_dma_receive_complete(struct ali_ircc_cb *self)
1957 * Transmit the frame! 1960 * Transmit the frame!
1958 * 1961 *
1959 */ 1962 */
1960static int ali_ircc_sir_hard_xmit(struct sk_buff *skb, struct net_device *dev) 1963static netdev_tx_t ali_ircc_sir_hard_xmit(struct sk_buff *skb,
1964 struct net_device *dev)
1961{ 1965{
1962 struct ali_ircc_cb *self; 1966 struct ali_ircc_cb *self;
1963 unsigned long flags; 1967 unsigned long flags;