[PATCH 20/77] irda: convert ks959 device to net_device_ops

Previous thread: [PATCH 03/77] infiniband: convert c2 to net_device_ops by Stephen Hemminger on Friday, March 20, 2009 - 10:35 pm. (5 messages)

Next thread: [PATCH 16/77] irda: convert via-ircc to net_device_ops by Stephen Hemminger on Friday, March 20, 2009 - 10:35 pm. (3 messages)
From: Stephen Hemminger
Date: Friday, March 20, 2009 - 10:35 pm

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>

--- a/drivers/net/irda/ks959-sir.c	2009-03-19 23:10:00.793089980 -0700
+++ b/drivers/net/irda/ks959-sir.c	2009-03-19 23:11:27.344651666 -0700
@@ -668,6 +668,12 @@ static int ks959_net_ioctl(struct net_de
 	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_interf
 	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)

-- 

--

From: David Miller
Date: Saturday, March 21, 2009 - 7:37 pm

From: Stephen Hemminger <shemminger@vyatta.com>

Applied.
--

From: Samuel Ortiz
Date: Monday, March 23, 2009 - 4:37 am

-- 
Intel Open Source Technology Centre
http://oss.intel.com/
--

Previous thread: [PATCH 03/77] infiniband: convert c2 to net_device_ops by Stephen Hemminger on Friday, March 20, 2009 - 10:35 pm. (5 messages)

Next thread: [PATCH 16/77] irda: convert via-ircc to net_device_ops by Stephen Hemminger on Friday, March 20, 2009 - 10:35 pm. (3 messages)