Commit fffe470a authored Nov 07, 2007 by Patrick McHardy Committed by David S. Miller Nov 07, 2007

[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>

parent 45a19b0a

net/8021q/vlan.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -747,6 +747,7 @@ static int vlan_ioctl_handler(struct net net, 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:

Admin message