From 807c8be83a7676657908dbb5345be5218861af7d Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 20 Mar 2009 19:35:45 +0000 Subject: [PATCH] --- yaml --- r: 135393 b: refs/heads/master c: 9b634007d5694178c4e142fbc5f9dbcd767eafbd h: refs/heads/master i: 135391: 6a37b097be1c91dc9e557448d8fabaeddaacdbb4 v: v3 --- [refs] | 2 +- trunk/drivers/net/irda/kingsun-sir.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index dadfa0664a30..d7ac94b19ead 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b023f46cbc6187f6ee88e778ed798745b5b2bfe +refs/heads/master: 9b634007d5694178c4e142fbc5f9dbcd767eafbd diff --git a/trunk/drivers/net/irda/kingsun-sir.c b/trunk/drivers/net/irda/kingsun-sir.c index b4a61717254a..9d813bc4502e 100644 --- a/trunk/drivers/net/irda/kingsun-sir.c +++ b/trunk/drivers/net/irda/kingsun-sir.c @@ -418,6 +418,12 @@ static int kingsun_net_ioctl(struct net_device *netdev, struct ifreq *rq, return ret; } +static const struct net_device_ops kingsun_ops = { + .ndo_start_xmit = kingsun_hard_xmit, + .ndo_open = kingsun_net_open, + .ndo_stop = kingsun_net_close, + .ndo_do_ioctl = kingsun_net_ioctl, +}; /* * This routine is called by the USB subsystem for each new device @@ -520,10 +526,7 @@ static int kingsun_probe(struct usb_interface *intf, irda_qos_bits_to_value(&kingsun->qos); /* Override the network functions we need to use */ - net->hard_start_xmit = kingsun_hard_xmit; - net->open = kingsun_net_open; - net->stop = kingsun_net_close; - net->do_ioctl = kingsun_net_ioctl; + net->netdev_ops = &kingsun_ops; ret = register_netdev(net); if (ret != 0)