From 6b23e8ffadf5508912f8245a5dd2e7b2c3bccd3f Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Fri, 20 Mar 2009 19:35:33 +0000
Subject: [PATCH] --- yaml --- r: 135381 b: refs/heads/master c:
 92bcd4fe9a63e8785a4f6ba4262ee601c271a70b h: refs/heads/master i:   135379:
 313f5238c24f2e4743b9120ce2350f73a0fe6453 v: v3

---
 [refs]                       | 2 +-
 trunk/net/irda/irda_device.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 0affc7f46f1e..488d7fb4385c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe8114e8e1d15ba07ddcaebc4741957a1546f307
+refs/heads/master: 92bcd4fe9a63e8785a4f6ba4262ee601c271a70b
diff --git a/trunk/net/irda/irda_device.c b/trunk/net/irda/irda_device.c
index ea319e3ddc18..bf92e1473447 100644
--- a/trunk/net/irda/irda_device.c
+++ b/trunk/net/irda/irda_device.c
@@ -149,13 +149,14 @@ int irda_device_is_receiving(struct net_device *dev)
 
 	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;