aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/irda/irda-usb.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/irda-usb.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/irda-usb.c')
-rw-r--r--drivers/net/irda/irda-usb.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c
index 6a1aa7a40fe2..215adf6377d0 100644
--- a/drivers/net/irda/irda-usb.c
+++ b/drivers/net/irda/irda-usb.c
@@ -111,7 +111,8 @@ static void irda_usb_init_qos(struct irda_usb_cb *self) ;
111static struct irda_class_desc *irda_usb_find_class_desc(struct usb_interface *intf); 111static struct irda_class_desc *irda_usb_find_class_desc(struct usb_interface *intf);
112static void irda_usb_disconnect(struct usb_interface *intf); 112static void irda_usb_disconnect(struct usb_interface *intf);
113static void irda_usb_change_speed_xbofs(struct irda_usb_cb *self); 113static void irda_usb_change_speed_xbofs(struct irda_usb_cb *self);
114static int irda_usb_hard_xmit(struct sk_buff *skb, struct net_device *dev); 114static netdev_tx_t irda_usb_hard_xmit(struct sk_buff *skb,
115 struct net_device *dev);
115static int irda_usb_open(struct irda_usb_cb *self); 116static int irda_usb_open(struct irda_usb_cb *self);
116static void irda_usb_close(struct irda_usb_cb *self); 117static void irda_usb_close(struct irda_usb_cb *self);
117static void speed_bulk_callback(struct urb *urb); 118static void speed_bulk_callback(struct urb *urb);
@@ -381,7 +382,8 @@ static void speed_bulk_callback(struct urb *urb)
381/* 382/*
382 * Send an IrDA frame to the USB dongle (for transmission) 383 * Send an IrDA frame to the USB dongle (for transmission)
383 */ 384 */
384static int irda_usb_hard_xmit(struct sk_buff *skb, struct net_device *netdev) 385static netdev_tx_t irda_usb_hard_xmit(struct sk_buff *skb,
386 struct net_device *netdev)
385{ 387{
386 struct irda_usb_cb *self = netdev_priv(netdev); 388 struct irda_usb_cb *self = netdev_priv(netdev);
387 struct urb *urb = self->tx_urb; 389 struct urb *urb = self->tx_urb;