Commit 6518bbb8 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

irda: convert to netdev_tx_t 



Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dbf02fae

drivers/net/irda/ali-ircc.c

+8 −4
Original line number Diff line number Diff line
@@ -111,7 +111,8 @@ static int ali_ircc_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd 
static void ali_ircc_change_speed(struct ali_ircc_cb *self, __u32 baud);



/* SIR function */

static int  ali_ircc_sir_hard_xmit(struct sk_buff *skb, struct net_device *dev);

static netdev_tx_t ali_ircc_sir_hard_xmit(struct sk_buff *skb,

						struct net_device *dev);

static irqreturn_t ali_ircc_sir_interrupt(struct ali_ircc_cb *self);

static void ali_ircc_sir_receive(struct ali_ircc_cb *self);

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); 
static void ali_ircc_sir_change_speed(struct ali_ircc_cb *priv, __u32 speed);



/* FIR function */

static int  ali_ircc_fir_hard_xmit(struct sk_buff *skb, struct net_device *dev);

static netdev_tx_t  ali_ircc_fir_hard_xmit(struct sk_buff *skb,

						 struct net_device *dev);

static void ali_ircc_fir_change_speed(struct ali_ircc_cb *priv, __u32 speed);

static irqreturn_t ali_ircc_fir_interrupt(struct ali_ircc_cb *self);

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) 
 *    Transmit the frame

 *

 */

static int ali_ircc_fir_hard_xmit(struct sk_buff *skb, struct net_device *dev)

static netdev_tx_t ali_ircc_fir_hard_xmit(struct sk_buff *skb,

						struct net_device *dev)

{

	struct ali_ircc_cb *self;

	unsigned long flags;
@@ -1957,7 +1960,8 @@ static int ali_ircc_dma_receive_complete(struct ali_ircc_cb *self) 
 *    Transmit the frame!

 *

 */

static int ali_ircc_sir_hard_xmit(struct sk_buff *skb, struct net_device *dev)

static netdev_tx_t ali_ircc_sir_hard_xmit(struct sk_buff *skb,

						struct net_device *dev)

{

	struct ali_ircc_cb *self;

	unsigned long flags;

drivers/net/irda/donauboe.c

+1 −1
Original line number Diff line number Diff line
@@ -970,7 +970,7 @@ toshoboe_probe (struct toshoboe_cb *self) 
/* Netdev style code */



/* Transmit something */

static int

static netdev_tx_t

toshoboe_hard_xmit (struct sk_buff *skb, struct net_device *dev)

{

  struct toshoboe_cb *self;

drivers/net/irda/irda-usb.c

+4 −2
Original line number Diff line number Diff line
@@ -111,7 +111,8 @@ static void irda_usb_init_qos(struct irda_usb_cb *self) ; 
static struct irda_class_desc *irda_usb_find_class_desc(struct usb_interface *intf);

static void irda_usb_disconnect(struct usb_interface *intf);

static void irda_usb_change_speed_xbofs(struct irda_usb_cb *self);

static int irda_usb_hard_xmit(struct sk_buff *skb, struct net_device *dev);

static netdev_tx_t irda_usb_hard_xmit(struct sk_buff *skb,

					    struct net_device *dev);

static int irda_usb_open(struct irda_usb_cb *self);

static void irda_usb_close(struct irda_usb_cb *self);

static void speed_bulk_callback(struct urb *urb);
@@ -381,7 +382,8 @@ static void speed_bulk_callback(struct urb *urb) 
/*

 * Send an IrDA frame to the USB dongle (for transmission)

 */

static int irda_usb_hard_xmit(struct sk_buff *skb, struct net_device *netdev)

static netdev_tx_t irda_usb_hard_xmit(struct sk_buff *skb,

					    struct net_device *netdev)

{

	struct irda_usb_cb *self = netdev_priv(netdev);

	struct urb *urb = self->tx_urb;

drivers/net/irda/kingsun-sir.c

+3 −2
Original line number Diff line number Diff line
@@ -150,7 +150,8 @@ static void kingsun_send_irq(struct urb *urb) 
/*

 * Called from net/core when new frame is available.

 */

static int kingsun_hard_xmit(struct sk_buff *skb, struct net_device *netdev)

static netdev_tx_t kingsun_hard_xmit(struct sk_buff *skb,

					   struct net_device *netdev)

{

	struct kingsun_cb *kingsun;

	int wraplen;

drivers/net/irda/ks959-sir.c

+2 −1
Original line number Diff line number Diff line
@@ -385,7 +385,8 @@ static void ks959_send_irq(struct urb *urb) 
/*

 * Called from net/core when new frame is available.

 */

static int ks959_hard_xmit(struct sk_buff *skb, struct net_device *netdev)

static netdev_tx_t ks959_hard_xmit(struct sk_buff *skb,

					 struct net_device *netdev)

{

	struct ks959_cb *kingsun;

	unsigned int wraplen;