This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / net / wireless / wl3501_cs.c

diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c
index ffd8d7d..4e62fa6 100644 (file)
--- a/drivers/net/wireless/wl3501_cs.c
+++ b/drivers/net/wireless/wl3501_cs.c
@@ -1487,14 +1487,55 @@ struct iw_statistics *wl3501_get_wireless_stats(struct net_device *dev)
        return wstats;
 }
 
-static void wl3501_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
+static inline int wl3501_ethtool_ioctl(struct net_device *dev, void __user *uaddr)
 {
-       strlcpy(info->driver, wl3501_dev_info, sizeof(info->driver));
+       u32 ethcmd;
+       int rc = -EFAULT;
+
+       if (copy_from_user(&ethcmd, uaddr, sizeof(ethcmd)))
+               goto out;
+
+       switch (ethcmd) {
+       case ETHTOOL_GDRVINFO: {
+               struct ethtool_drvinfo info = { .cmd = ETHTOOL_GDRVINFO, };
+
+               strlcpy(info.driver, wl3501_dev_info, sizeof(info.driver));
+               rc = copy_to_user(uaddr, &info, sizeof(info)) ? -EFAULT : 1;
+       }
+       default:
+               rc = -EOPNOTSUPP;
+               break;
+       }
+out:
+       return rc;
 }
 
-static struct ethtool_ops ops = {
-       .get_drvinfo = wl3501_get_drvinfo
-};
+/**
+ * wl3501_ioctl - Perform IOCTL call functions
+ * @dev - network device
+ * @ifreq - request
+ * @cmd - command
+ *
+ * Perform IOCTL call functions here. Some are privileged operations and the
+ * effective uid is checked in those cases.
+ *
+ * This part is optional. Needed only if you want to run wlu (unix version).
+ *
+ * CAUTION: To prevent interrupted by wl3501_interrupt() and timer-based
+ * wl3501_hard_start_xmit() from other interrupts, this should be run
+ * single-threaded.
+ */
+static int wl3501_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+{
+       int rc = -ENODEV;
+
+       if (netif_device_present(dev)) {
+               rc = -EOPNOTSUPP;
+               if (cmd == SIOCETHTOOL)
+                       rc = wl3501_ethtool_ioctl(dev, rq->ifr_data);
+       }
+       return rc;
+}
 
 /**
  * wl3501_detach - deletes a driver "instance"
@@ -2006,8 +2047,8 @@ static dev_link_t *wl3501_attach(void)
        dev->watchdog_timeo     = 5 * HZ;
        dev->get_stats          = wl3501_get_stats;
        dev->get_wireless_stats = wl3501_get_wireless_stats;
+       dev->do_ioctl           = wl3501_ioctl;
        dev->wireless_handlers  = (struct iw_handler_def *)&wl3501_handler_def;
-       SET_ETHTOOL_OPS(dev, &ops);
        netif_stop_queue(dev);
        link->priv = link->irq.Instance = dev;