Re: [PATCH 17/77] irda: convert sir device to net_device_ops

Previous thread: [PATCH 57/77] wavelan: convert to internal net_device_stats by Stephen Hemminger on Friday, March 20, 2009 - 10:36 pm. (2 messages)

Next thread: [PATCH 15/77] irda: convert smsc driver 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/sir_dev.c	2009-03-19 22:52:52.826089334 -0700
+++ b/drivers/net/irda/sir_dev.c	2009-03-19 23:09:32.268774083 -0700
@@ -865,6 +865,12 @@ out:
 	return 0;
 }
 
+static const struct net_device_ops sirdev_ops = {
+	.ndo_start_xmit	= sirdev_hard_xmit,
+	.ndo_open	= sirdev_open,
+	.ndo_stop	= sirdev_close,
+	.ndo_do_ioctl	= sirdev_ioctl,
+};
 /* ----------------------------------------------------------------------------- */
 
 struct sir_dev * sirdev_get_instance(const struct sir_driver *drv, const char *name)
@@ -908,10 +914,7 @@ struct sir_dev * sirdev_get_instance(con
 	dev->netdev = ndev;
 
 	/* Override the network functions we need to use */
-	ndev->hard_start_xmit = sirdev_hard_xmit;
-	ndev->open = sirdev_open;
-	ndev->stop = sirdev_close;
-	ndev->do_ioctl = sirdev_ioctl;
+	ndev->netdev_ops = &sirdev_ops;
 
 	if (register_netdev(ndev)) {
 		IRDA_ERROR("%s(), register_netdev() failed!\n", __func__);

-- 

--

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

From: Stephen Hemminger <shemminger@vyatta.com>

Applied.
--

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

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

Previous thread: [PATCH 57/77] wavelan: convert to internal net_device_stats by Stephen Hemminger on Friday, March 20, 2009 - 10:36 pm. (2 messages)

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