Skip to content

Commit

Permalink
[VLAN]: Remove non-implemented ioctls
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Patrick McHardy authored and David S. Miller committed Jan 28, 2008
1 parent 40f98e1 commit 198a291
Showing 1 changed file with 1 addition and 22 deletions.
23 changes: 1 addition & 22 deletions net/8021q/vlan.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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:
Expand Down

0 comments on commit 198a291

Please sign in to comment.