Commit 9def747b authored by Patrick McHardy's avatar Patrick McHardy Committed by Greg Kroah-Hartman

Fix SET_VLAN_INGRESS_PRIORITY_CMD error return.

patch fffe470a in mainline.

[VLAN]: Fix SET_VLAN_INGRESS_PRIORITY_CMD ioctl

Based on report and patch by Doug Kehn <rdkehn@yahoo.com>:

vconfig returns the following error when attempting to execute the
set_ingress_map command:

vconfig: socket or ioctl error for set_ingress_map: Operation not permitted

In vlan.c, vlan_ioctl_handler for SET_VLAN_INGRESS_PRIORITY_CMD
sets err = -EPERM and calls vlan_dev_set_ingress_priority.
vlan_dev_set_ingress_priority is a void function so err remains
at -EPERM and results in the vconfig error (even though the ingress
map was set).

Fix by setting err = 0 after the vlan_dev_set_ingress_priority call.
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent dae1e6e8
...@@ -744,6 +744,7 @@ static int vlan_ioctl_handler(void __user *arg) ...@@ -744,6 +744,7 @@ static int vlan_ioctl_handler(void __user *arg)
vlan_dev_set_ingress_priority(dev, vlan_dev_set_ingress_priority(dev,
args.u.skb_priority, args.u.skb_priority,
args.vlan_qos); args.vlan_qos);
err = 0;
break; break;
case SET_VLAN_EGRESS_PRIORITY_CMD: case SET_VLAN_EGRESS_PRIORITY_CMD:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment