---

yaml --- r: 135381 b: refs/heads/master c: 92bcd4f h: refs/heads/master i: 135379: 313f523 v: v3
git-mirror · Mar 22, 2009 · 6b23e8f · 6b23e8f
1 parent d7d082e
commit 6b23e8f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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;