diff options
| author | Patrick McHardy <kaber@trash.net> | 2007-11-13 00:13:37 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-11-16 08:27:37 -0800 |
| commit | 9def747b654622c8ce0936ccb0f4670f978c138e (patch) | |
| tree | 5b0758eae3a14652407b10f96aed59d1dace38b4 /net | |
| parent | dae1e6e82707b560430ef0a9a24c57724cfdb8ae (diff) | |
Fix SET_VLAN_INGRESS_PRIORITY_CMD error return.
patch fffe470a803e7f7b74c016291e542a0162761209 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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/8021q/vlan.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index 327ff81ebbd..ef3f7898232 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c @@ -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: |