diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-08-31 15:50:50 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-01 04:13:38 -0400 |
commit | 6518bbb803fe02b15a3211c8db2afdff0ac4f808 (patch) | |
tree | 85b5df710063c22164150fb4fcf37098f188240a /drivers/net/irda/kingsun-sir.c | |
parent | dbf02fae406daf4d583a279743869c686024c341 (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/kingsun-sir.c')
-rw-r--r-- | drivers/net/irda/kingsun-sir.c | 5 |
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) | |||
150 | /* | 150 | /* |
151 | * Called from net/core when new frame is available. | 151 | * Called from net/core when new frame is available. |
152 | */ | 152 | */ |
153 | static int kingsun_hard_xmit(struct sk_buff *skb, struct net_device *netdev) | 153 | static netdev_tx_t kingsun_hard_xmit(struct sk_buff *skb, |
154 | struct net_device *netdev) | ||
154 | { | 155 | { |
155 | struct kingsun_cb *kingsun; | 156 | struct kingsun_cb *kingsun; |
156 | int wraplen; | 157 | int wraplen; |
@@ -416,7 +417,7 @@ static int kingsun_net_ioctl(struct net_device *netdev, struct ifreq *rq, | |||
416 | } | 417 | } |
417 | 418 | ||
418 | static const struct net_device_ops kingsun_ops = { | 419 | static const struct net_device_ops kingsun_ops = { |
419 | .ndo_start_xmit = kingsun_hard_xmit, | 420 | .ndo_start_xmit = kingsun_hard_xmit, |
420 | .ndo_open = kingsun_net_open, | 421 | .ndo_open = kingsun_net_open, |
421 | .ndo_stop = kingsun_net_close, | 422 | .ndo_stop = kingsun_net_close, |
422 | .ndo_do_ioctl = kingsun_net_ioctl, | 423 | .ndo_do_ioctl = kingsun_net_ioctl, |