[VLAN]: Remove non-implemented ioctls

The GET_VLAN_INGRESS_PRIORITY_CMD/GET_VLAN_EGRESS_PRIORITY_CMD ioctls are
not implemented and won't be, new functionality will be added to the netlink
interface. Remove the code and make the ioctl handler return -EOPNOTSUPP
for unknown commands instead of -EINVAL.

Also remove a comment about passing unknown commands to the underlying
device, that doesn't make any sense since its a VLAN specific ioctl and
if its not implemented here, its implemented nowhere.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index 6edd1919d1837cdb32293c966b5ce443f1ccfebe..69a9e0207b13092280912b2de487a9c98f397877 100644 (file)
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -688,26 +688,6 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
                err = unregister_vlan_device(dev);
                break;
 
-       case GET_VLAN_INGRESS_PRIORITY_CMD:
-               /* TODO:  Implement
-                  err = vlan_dev_get_ingress_priority(args);
-                  if (copy_to_user((void*)arg, &args,
-                       sizeof(struct vlan_ioctl_args))) {
-                       err = -EFAULT;
-                  }
-               */
-               err = -EINVAL;
-               break;
-       case GET_VLAN_EGRESS_PRIORITY_CMD:
-               /* TODO:  Implement
-                  err = vlan_dev_get_egress_priority(args.device1, &(args.args);
-                  if (copy_to_user((void*)arg, &args,
-                       sizeof(struct vlan_ioctl_args))) {
-                       err = -EFAULT;
-                  }
-               */
-               err = -EINVAL;
-               break;
        case GET_VLAN_REALDEV_NAME_CMD:
                err = 0;
                vlan_dev_get_realdev_name(dev, args.u.device2);
@@ -728,8 +708,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
                break;
 
        default:
-               /* pass on to underlying device instead?? */
-               err = -EINVAL;
+               err = -EOPNOTSUPP;
                break;
        }
 out: