From 3d653301be0d32cada61013de26d365b0859c6fc Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 20 Mar 2009 19:35:47 +0000 Subject: [PATCH] --- yaml --- r: 135395 b: refs/heads/master c: 94ffab6d199ab36e5dfd2f2f0e4bb135728526c4 h: refs/heads/master i: 135393: 807c8be83a7676657908dbb5345be5218861af7d 135391: 6a37b097be1c91dc9e557448d8fabaeddaacdbb4 v: v3 --- [refs] | 2 +- trunk/drivers/net/irda/ks959-sir.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e34a936661c5..917840785463 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0c818a6273218f5a827fe5f41f01caeb679b469e +refs/heads/master: 94ffab6d199ab36e5dfd2f2f0e4bb135728526c4 diff --git a/trunk/drivers/net/irda/ks959-sir.c b/trunk/drivers/net/irda/ks959-sir.c index 55322fb92cf1..b6ffe9715b61 100644 --- a/trunk/drivers/net/irda/ks959-sir.c +++ b/trunk/drivers/net/irda/ks959-sir.c @@ -668,6 +668,12 @@ static int ks959_net_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd) return ret; } +static const struct net_device_ops ks959_ops = { + .ndo_start_xmit = ks959_hard_xmit, + .ndo_open = ks959_net_open, + .ndo_stop = ks959_net_close, + .ndo_do_ioctl = ks959_net_ioctl, +}; /* * This routine is called by the USB subsystem for each new device * in the system. We need to check if the device is ours, and in @@ -780,10 +786,7 @@ static int ks959_probe(struct usb_interface *intf, irda_qos_bits_to_value(&kingsun->qos); /* Override the network functions we need to use */ - net->hard_start_xmit = ks959_hard_xmit; - net->open = ks959_net_open; - net->stop = ks959_net_close; - net->do_ioctl = ks959_net_ioctl; + net->netdev_ops = &ks959_ops; ret = register_netdev(net); if (ret != 0)