[PATCH 05/10] kill bond_ioctl()

[Al Viro]

From: Al Viro <v...@zeniv.linux.org.uk>

another sock_do_ioctl() equivalent

Signed-off-by: Al Viro <v...@zeniv.linux.org.uk>
---
 net/socket.c | 36 ++++--------------------------------
 1 file changed, 4 insertions(+), 32 deletions(-)

diff --git a/net/socket.c b/net/socket.c
index f280258bd6a4..b267d051b50d 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -2861,33 +2861,6 @@ static int compat_siocwandev(struct net *net, struct 
compat_ifreq __user *uifr32
        return dev_ioctl(net, SIOCWANDEV, uifr);
 }
 
-static int bond_ioctl(struct net *net, unsigned int cmd,
-                        struct compat_ifreq __user *ifr32)
-{
-       struct ifreq kifr;
-       mm_segment_t old_fs;
-       int err;
-
-       switch (cmd) {
-       case SIOCBONDENSLAVE:
-       case SIOCBONDRELEASE:
-       case SIOCBONDSETHWADDR:
-       case SIOCBONDCHANGEACTIVE:
-               if (copy_from_user(&kifr, ifr32, sizeof(struct compat_ifreq)))
-                       return -EFAULT;
-
-               old_fs = get_fs();
-               set_fs(KERNEL_DS);
-               err = dev_ioctl(net, cmd,
-                               (struct ifreq __user __force *) &kifr);
-               set_fs(old_fs);
-
-               return err;
-       default:
-               return -ENOIOCTLCMD;
-       }
-}
-
 /* Handle ioctls that use ifreq::ifr_data and just need struct ifreq converted 
*/
 static int compat_ifr_data_ioctl(struct net *net, unsigned int cmd,
                                 struct compat_ifreq __user *u_ifreq32)
@@ -3081,11 +3054,6 @@ static int compat_sock_ioctl_trans(struct file *file, 
struct socket *sock,
        case SIOCGIFMAP:
        case SIOCSIFMAP:
                return compat_sioc_ifmap(net, cmd, argp);
-       case SIOCBONDENSLAVE:
-       case SIOCBONDRELEASE:
-       case SIOCBONDSETHWADDR:
-       case SIOCBONDCHANGEACTIVE:
-               return bond_ioctl(net, cmd, argp);
        case SIOCADDRT:
        case SIOCDELRT:
                return routing_ioctl(net, sock, cmd, argp);
@@ -3149,6 +3117,10 @@ static int compat_sock_ioctl_trans(struct file *file, 
struct socket *sock,
        case SIOCGARP:
        case SIOCDARP:
        case SIOCATMARK:
+       case SIOCBONDENSLAVE:
+       case SIOCBONDRELEASE:
+       case SIOCBONDSETHWADDR:
+       case SIOCBONDCHANGEACTIVE:
                return sock_do_ioctl(net, sock, cmd, arg);
        }
 
-- 
2.11.0