Fix SET_VLAN_INGRESS_PRIORITY_CMD error return.
patch fffe470a80 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: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
dae1e6e827
commit
9def747b65
@@ -744,6 +744,7 @@ static int vlan_ioctl_handler(void __user *arg)
|
||||
vlan_dev_set_ingress_priority(dev,
|
||||
args.u.skb_priority,
|
||||
args.vlan_qos);
|
||||
err = 0;
|
||||
break;
|
||||
|
||||
case SET_VLAN_EGRESS_PRIORITY_CMD:
|
||||
|
||||
Reference in New Issue
Block a user