aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2008-01-21 03:24:59 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:08:29 -0500
commit198a291ce3a9103f4738600e3cf5416b66e009d9 (patch)
tree0061845c87e33b6b0db51580433ea2e29e193714
parent40f98e1af4c6082f7f98391540a2a1ade030480a (diff)
[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>
-rw-r--r--net/8021q/vlan.c23
1 files changed, 1 insertions, 22 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index 6edd1919d183..69a9e0207b13 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)
688 err = unregister_vlan_device(dev); 688 err = unregister_vlan_device(dev);
689 break; 689 break;
690 690
691 case GET_VLAN_INGRESS_PRIORITY_CMD:
692 /* TODO: Implement
693 err = vlan_dev_get_ingress_priority(args);
694 if (copy_to_user((void*)arg, &args,
695 sizeof(struct vlan_ioctl_args))) {
696 err = -EFAULT;
697 }
698 */
699 err = -EINVAL;
700 break;
701 case GET_VLAN_EGRESS_PRIORITY_CMD:
702 /* TODO: Implement
703 err = vlan_dev_get_egress_priority(args.device1, &(args.args);
704 if (copy_to_user((void*)arg, &args,
705 sizeof(struct vlan_ioctl_args))) {
706 err = -EFAULT;
707 }
708 */
709 err = -EINVAL;
710 break;
711 case GET_VLAN_REALDEV_NAME_CMD: 691 case GET_VLAN_REALDEV_NAME_CMD:
712 err = 0; 692 err = 0;
713 vlan_dev_get_realdev_name(dev, args.u.device2); 693 vlan_dev_get_realdev_name(dev, args.u.device2);
@@ -728,8 +708,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
728 break; 708 break;
729 709
730 default: 710 default:
731 /* pass on to underlying device instead?? */ 711 err = -EOPNOTSUPP;
732 err = -EINVAL;
733 break; 712 break;
734 } 713 }
735out: 714out: