Home » Mailing list archives » linux-netdev » 2009 » March » 21

[PATCH 14/77] irda: convert vlsi driver to net_device_ops

Previous 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)

Next thread: [PATCH 22/77] usbnet: convert catc device to net_device_ops by Stephen Hemminger on Friday, March 20, 2009 - 10:35 pm. (6 messages)
[view original message]
From: Stephen Hemminger
Subject: [PATCH 14/77] irda: convert vlsi driver to net_device_ops
Date: Friday, March 20, 2009 - 10:35 pm

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


---
 drivers/net/irda/vlsi_ir.c |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

--- a/drivers/net/irda/vlsi_ir.c	2009-03-19 22:40:30.270902366 -0700
+++ b/drivers/net/irda/vlsi_ir.c	2009-03-19 22:42:50.764027628 -0700
@@ -1573,6 +1573,14 @@ static int vlsi_close(struct net_device 
 	return 0;
 }
 
+static const struct net_device_ops vlsi_netdev_ops = {
+	.ndo_open       = vlsi_open,
+	.ndo_stop       = vlsi_close,
+	.ndo_start_xmit = vlsi_hard_start_xmit,
+	.ndo_do_ioctl   = vlsi_ioctl,
+	.ndo_tx_timeout = vlsi_tx_timeout,
+};
+
 static int vlsi_irda_init(struct net_device *ndev)
 {
 	vlsi_irda_dev_t *idev = netdev_priv(ndev);
@@ -1608,11 +1616,7 @@ static int vlsi_irda_init(struct net_dev
 	ndev->flags |= IFF_PORTSEL | IFF_AUTOMEDIA;
 	ndev->if_port = IF_PORT_UNKNOWN;
  
-	ndev->open	      = vlsi_open;
-	ndev->stop	      = vlsi_close;
-	ndev->hard_start_xmit = vlsi_hard_start_xmit;
-	ndev->do_ioctl	      = vlsi_ioctl;
-	ndev->tx_timeout      = vlsi_tx_timeout;
+	ndev->netdev_ops = &vlsi_netdev_ops;
 	ndev->watchdog_timeo  = 500*HZ/1000;	/* max. allowed turn time for IrLAP */
 
 	SET_NETDEV_DEV(ndev, &pdev->dev);

-- 

--


[ message continues ]
[view original message]
From: David Miller
Subject: Re: [PATCH 14/77] irda: convert vlsi driver to net_device_ops
Date: Saturday, March 21, 2009 - 7:36 pm

From: Stephen Hemminger <shemminger@vyatta.com>

Applied.
--


[ message continues ]
[view original message]
From: Samuel Ortiz
Subject: Re: [PATCH 14/77] irda: convert vlsi driver to net_device_ops
Date: Monday, March 23, 2009 - 4:35 am

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


[ message continues ]
Previous 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)

Next thread: [PATCH 22/77] usbnet: convert catc device to net_device_ops by Stephen Hemminger on Friday, March 20, 2009 - 10:35 pm. (6 messages)