Re: [PATCH 06/77] irda: net_device_ops ioctl fix

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

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

Need to reference net_device_ops not old pointer.

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


---
 net/irda/irda_device.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- a/net/irda/irda_device.c	2009-03-19 22:40:30.469964248 -0700
+++ b/net/irda/irda_device.c	2009-03-19 22:42:44.867089916 -0700
@@ -149,13 +149,14 @@ int irda_device_is_receiving(struct net_
 
 	IRDA_DEBUG(2, "%s()\n", __func__);
 
-	if (!dev->do_ioctl) {
+	if (!dev->netdev_ops->ndo_do_ioctl) {
 		IRDA_ERROR("%s: do_ioctl not impl. by device driver\n",
 			   __func__);
 		return -1;
 	}
 
-	ret = dev->do_ioctl(dev, (struct ifreq *) &req, SIOCGRECEIVING);
+	ret = (dev->netdev_ops->ndo_do_ioctl)(dev, (struct ifreq *) &req,
+					      SIOCGRECEIVING);
 	if (ret < 0)
 		return ret;
 

-- 

--

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:33 am

Thanks Stephen...


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

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

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

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

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