bonding: use siocdevprivate

The bonding driver supports two command codes for each operation: one
in the SIOCDEVPRIVATE range and another one with the same definition
but a unique command code.

Only the second set currently works in compat mode, as the ifr_data
expansion overwrites part of the ifr_slave field.

Move the private ones into ndo_siocdevprivate and change the
implementation to call the other function.  This makes both version
work correctly.

Cc: Jay Vosburgh <j.vosburgh@gmail.com>
Cc: Veaceslav Falico <vfalico@gmail.com>
Cc: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 31730ef..9686418 100644 (file)
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -4000,7 +4000,6 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd
                }
 
                return 0;
-       case BOND_INFO_QUERY_OLD:
        case SIOCBONDINFOQUERY:
                u_binfo = (struct ifbond __user *)ifr->ifr_data;
 
@@ -4012,7 +4011,6 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd
                        return -EFAULT;
 
                return 0;
-       case BOND_SLAVE_INFO_QUERY_OLD:
        case SIOCBONDSLAVEINFOQUERY:
                u_sinfo = (struct ifslave __user *)ifr->ifr_data;
 
@@ -4042,19 +4040,15 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd
                return -ENODEV;
 
        switch (cmd) {
-       case BOND_ENSLAVE_OLD:
        case SIOCBONDENSLAVE:
                res = bond_enslave(bond_dev, slave_dev, NULL);
                break;
-       case BOND_RELEASE_OLD:
        case SIOCBONDRELEASE:
                res = bond_release(bond_dev, slave_dev);
                break;
-       case BOND_SETHWADDR_OLD:
        case SIOCBONDSETHWADDR:
                res = bond_set_dev_addr(bond_dev, slave_dev);
                break;
-       case BOND_CHANGE_ACTIVE_OLD:
        case SIOCBONDCHANGEACTIVE:
                bond_opt_initstr(&newval, slave_dev->name);
                res = __bond_opt_set_notify(bond, BOND_OPT_ACTIVE_SLAVE,
@@ -4067,6 +4061,29 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd
        return res;
 }
 
+static int bond_siocdevprivate(struct net_device *bond_dev, struct ifreq *ifr,
+                              void __user *data, int cmd)
+{
+       struct ifreq ifrdata = { .ifr_data = data };
+
+       switch (cmd) {
+       case BOND_INFO_QUERY_OLD:
+               return bond_do_ioctl(bond_dev, &ifrdata, SIOCBONDINFOQUERY);
+       case BOND_SLAVE_INFO_QUERY_OLD:
+               return bond_do_ioctl(bond_dev, &ifrdata, SIOCBONDSLAVEINFOQUERY);
+       case BOND_ENSLAVE_OLD:
+               return bond_do_ioctl(bond_dev, ifr, SIOCBONDENSLAVE);
+       case BOND_RELEASE_OLD:
+               return bond_do_ioctl(bond_dev, ifr, SIOCBONDRELEASE);
+       case BOND_SETHWADDR_OLD:
+               return bond_do_ioctl(bond_dev, ifr, SIOCBONDSETHWADDR);
+       case BOND_CHANGE_ACTIVE_OLD:
+               return bond_do_ioctl(bond_dev, ifr, SIOCBONDCHANGEACTIVE);
+       }
+
+       return -EOPNOTSUPP;
+}
+
 static void bond_change_rx_flags(struct net_device *bond_dev, int change)
 {
        struct bonding *bond = netdev_priv(bond_dev);
@@ -4956,6 +4973,7 @@ static const struct net_device_ops bond_netdev_ops = {
        .ndo_select_queue       = bond_select_queue,
        .ndo_get_stats64        = bond_get_stats,
        .ndo_do_ioctl           = bond_do_ioctl,
+       .ndo_siocdevprivate     = bond_siocdevprivate,
        .ndo_change_rx_flags    = bond_change_rx_flags,
        .ndo_set_rx_mode        = bond_set_rx_mode,
        .ndo_change_mtu         = bond_change_mtu,