Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=198a291ce3a9103f4738600e3cf5416b66e009d9
Commit:     198a291ce3a9103f4738600e3cf5416b66e009d9
Parent:     40f98e1af4c6082f7f98391540a2a1ade030480a
Author:     Patrick McHardy <[EMAIL PROTECTED]>
AuthorDate: Mon Jan 21 00:24:59 2008 -0800
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Jan 28 15:08:29 2008 -0800

    [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 <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 net/8021q/vlan.c |   23 +----------------------
 1 files changed, 1 insertions(+), 22 deletions(-)

diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index 6edd191..69a9e02 100644
--- 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:
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to