Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / net / irda / irda_device.c

diff --git a/net/irda/irda_device.c b/net/irda/irda_device.c
index ea319e3ddc18c77a441d1093bc1b9bdac615f931..bf92e147344736bd39a4fce6b3977bc5c8ee1739 100644 (file)
--- a/net/irda/irda_device.c
+++ b/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;