airo: use ndo_siocdevprivate

The airo driver overloads SIOCDEVPRIVATE ioctls with another
set based on SIOCIWFIRSTPRIV. Only the first ones actually
work (also in compat mode) as the others do not get passed
down any more.

Change it over to ndo_siocdevprivate for clarification.

Cc: Kalle Valo <kvalo@codeaurora.org>
Cc: linux-wireless@vger.kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/wireless/cisco/airo.c b/drivers/net/wireless/cisco/airo.c
index fd37d4d..65dd8cf 100644 (file)
--- a/drivers/net/wireless/cisco/airo.c
+++ b/drivers/net/wireless/cisco/airo.c
@@ -1144,7 +1144,7 @@ static int waitbusy(struct airo_info *ai);
 static irqreturn_t airo_interrupt(int irq, void* dev_id);
 static int airo_thread(void *data);
 static void timer_func(struct net_device *dev);
-static int airo_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
+static int airo_siocdevprivate(struct net_device *dev, struct ifreq *rq, void __user *, int cmd);
 static struct iw_statistics *airo_get_wireless_stats(struct net_device *dev);
 #ifdef CISCO_EXT
 static int readrids(struct net_device *dev, aironet_ioctl *comp);
@@ -2664,7 +2664,7 @@ static const struct net_device_ops airo11_netdev_ops = {
        .ndo_start_xmit         = airo_start_xmit11,
        .ndo_get_stats          = airo_get_stats,
        .ndo_set_mac_address    = airo_set_mac_address,
-       .ndo_do_ioctl           = airo_ioctl,
+       .ndo_siocdevprivate     = airo_siocdevprivate,
 };
 
 static void wifi_setup(struct net_device *dev)
@@ -2764,7 +2764,7 @@ static const struct net_device_ops airo_netdev_ops = {
        .ndo_get_stats          = airo_get_stats,
        .ndo_set_rx_mode        = airo_set_multicast_list,
        .ndo_set_mac_address    = airo_set_mac_address,
-       .ndo_do_ioctl           = airo_ioctl,
+       .ndo_siocdevprivate     = airo_siocdevprivate,
        .ndo_validate_addr      = eth_validate_addr,
 };
 
@@ -2775,7 +2775,7 @@ static const struct net_device_ops mpi_netdev_ops = {
        .ndo_get_stats          = airo_get_stats,
        .ndo_set_rx_mode        = airo_set_multicast_list,
        .ndo_set_mac_address    = airo_set_mac_address,
-       .ndo_do_ioctl           = airo_ioctl,
+       .ndo_siocdevprivate     = airo_siocdevprivate,
        .ndo_validate_addr      = eth_validate_addr,
 };
 
@@ -7661,7 +7661,8 @@ static const struct iw_handler_def        airo_handler_def =
  * Javier Achirica did a great job of merging code from the unnamed CISCO
  * developer that added support for flashing the card.
  */
-static int airo_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+static int airo_siocdevprivate(struct net_device *dev, struct ifreq *rq,
+                              void __user *data, int cmd)
 {
        int rc = 0;
        struct airo_info *ai = dev->ml_priv;
@@ -7678,7 +7679,7 @@ static int airo_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
        {
                int val = AIROMAGIC;
                aironet_ioctl com;
-               if (copy_from_user(&com, rq->ifr_data, sizeof(com)))
+               if (copy_from_user(&com, data, sizeof(com)))
                        rc = -EFAULT;
                else if (copy_to_user(com.data, (char *)&val, sizeof(val)))
                        rc = -EFAULT;
@@ -7694,7 +7695,7 @@ static int airo_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                 */
        {
                aironet_ioctl com;
-               if (copy_from_user(&com, rq->ifr_data, sizeof(com))) {
+               if (copy_from_user(&com, data, sizeof(com))) {
                        rc = -EFAULT;
                        break;
                }