[PATCH 09/77] irda: convert mcs driver to net_device_ops

Previous thread: [PATCH 28/77] usbnet: convert asix driver to net_device_ops by Stephen Hemminger on Friday, March 20, 2009 - 10:35 pm. (3 messages)

Next thread: [PATCH 13/77] irda: convert ali 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>

---
 drivers/net/irda/mcs7780.c |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

--- a/drivers/net/irda/mcs7780.c	2009-03-19 22:40:30.408964174 -0700
+++ b/drivers/net/irda/mcs7780.c	2009-03-19 22:42:47.157714010 -0700
@@ -873,6 +873,13 @@ static int mcs_hard_xmit(struct sk_buff 
 	return ret;
 }
 
+static const struct net_device_ops mcs_netdev_ops = {
+	.ndo_open = mcs_net_open,
+	.ndo_stop = mcs_net_close,
+	.ndo_start_xmit = mcs_hard_xmit,
+	.ndo_do_ioctl = mcs_net_ioctl,
+};
+
 /*
  * This function is called by the USB subsystem for each new device in the
  * system.  Need to verify the device and if it is, then start handling it.
@@ -919,11 +926,7 @@ static int mcs_probe(struct usb_interfac
 	/* Speed change work initialisation*/
 	INIT_WORK(&mcs->work, mcs_speed_work);
 
-	/* Override the network functions we need to use */
-	ndev->hard_start_xmit = mcs_hard_xmit;
-	ndev->open = mcs_net_open;
-	ndev->stop = mcs_net_close;
-	ndev->do_ioctl = mcs_net_ioctl;
+	ndev->netdev_ops = &mcs_netdev_ops;
 
 	if (!intf->cur_altsetting)
 		goto error2;

-- 

--

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

From: Stephen Hemminger <shemminger@vyatta.com>

Applied.
--

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

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

Previous thread: [PATCH 28/77] usbnet: convert asix driver to net_device_ops by Stephen Hemminger on Friday, March 20, 2009 - 10:35 pm. (3 messages)

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