summaryrefslogtreecommitdiffstats
path: root/drivers/net/irda/kingsun-sir.c
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-08-31 21:50:50 +0200
committerDavid S. Miller <davem@davemloft.net>2009-09-01 10:13:38 +0200
commit6518bbb803fe02b15a3211c8db2afdff0ac4f808 (patch)
tree85b5df710063c22164150fb4fcf37098f188240a /drivers/net/irda/kingsun-sir.c
parentnetdev: convert pcmcia drivers to netdev_tx_t (diff)
downloadlinux-6518bbb803fe02b15a3211c8db2afdff0ac4f808.tar.xz
linux-6518bbb803fe02b15a3211c8db2afdff0ac4f808.zip
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/kingsun-sir.c')
-rw-r--r--drivers/net/irda/kingsun-sir.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/irda/kingsun-sir.c b/drivers/net/irda/kingsun-sir.c
index c3e4e2c435ba..2fc30b449eea 100644
--- a/drivers/net/irda/kingsun-sir.c
+++ b/drivers/net/irda/kingsun-sir.c
@@ -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;
@@ -416,7 +417,7 @@ static int kingsun_net_ioctl(struct net_device *netdev, struct ifreq *rq,
}
static const struct net_device_ops kingsun_ops = {
- .ndo_start_xmit = kingsun_hard_xmit,
+ .ndo_start_xmit = kingsun_hard_xmit,
.ndo_open = kingsun_net_open,
.ndo_stop = kingsun_net_close,
.ndo_do_ioctl = kingsun_net_ioctl,