diff options
Diffstat (limited to 'drivers/net/irda/ali-ircc.c')
-rw-r--r-- | drivers/net/irda/ali-ircc.c | 12 |
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 | |||
111 | static void ali_ircc_change_speed(struct ali_ircc_cb *self, __u32 baud); | 111 | static void ali_ircc_change_speed(struct ali_ircc_cb *self, __u32 baud); |
112 | 112 | ||
113 | /* SIR function */ | 113 | /* SIR function */ |
114 | static int ali_ircc_sir_hard_xmit(struct sk_buff *skb, struct net_device *dev); | 114 | static netdev_tx_t ali_ircc_sir_hard_xmit(struct sk_buff *skb, |
115 | struct net_device *dev); | ||
115 | static irqreturn_t ali_ircc_sir_interrupt(struct ali_ircc_cb *self); | 116 | static irqreturn_t ali_ircc_sir_interrupt(struct ali_ircc_cb *self); |
116 | static void ali_ircc_sir_receive(struct ali_ircc_cb *self); | 117 | static void ali_ircc_sir_receive(struct ali_ircc_cb *self); |
117 | static void ali_ircc_sir_write_wakeup(struct ali_ircc_cb *self); | 118 | static 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); | |||
119 | static void ali_ircc_sir_change_speed(struct ali_ircc_cb *priv, __u32 speed); | 120 | static void ali_ircc_sir_change_speed(struct ali_ircc_cb *priv, __u32 speed); |
120 | 121 | ||
121 | /* FIR function */ | 122 | /* FIR function */ |
122 | static int ali_ircc_fir_hard_xmit(struct sk_buff *skb, struct net_device *dev); | 123 | static netdev_tx_t ali_ircc_fir_hard_xmit(struct sk_buff *skb, |
124 | struct net_device *dev); | ||
123 | static void ali_ircc_fir_change_speed(struct ali_ircc_cb *priv, __u32 speed); | 125 | static void ali_ircc_fir_change_speed(struct ali_ircc_cb *priv, __u32 speed); |
124 | static irqreturn_t ali_ircc_fir_interrupt(struct ali_ircc_cb *self); | 126 | static irqreturn_t ali_ircc_fir_interrupt(struct ali_ircc_cb *self); |
125 | static int ali_ircc_dma_receive(struct ali_ircc_cb *self); | 127 | static 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 | */ |
1438 | static int ali_ircc_fir_hard_xmit(struct sk_buff *skb, struct net_device *dev) | 1440 | static 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 | */ |
1960 | static int ali_ircc_sir_hard_xmit(struct sk_buff *skb, struct net_device *dev) | 1963 | static 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; |