diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2007-07-24 18:37:11 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-07-24 18:37:11 -0400 |
commit | 3f5f4346b6d3c8bc33780a941da2473c4be2c989 (patch) | |
tree | addc6e4344ba3e54b31fd0a6fc867b938ba3c6f0 /net/8021q | |
parent | 79d310d01ec2a55e0ac1810aee56886ebee58c53 (diff) |
[8021Q]: vlan_ioctl_handler: fix return value
net/8021q/vlan.c: In function 'vlan_ioctl_handler':
net/8021q/vlan.c:700: warning: 'err' may be used uninitialized in this function
The warning is incorrect, but from my reading this ioctl will return -EINVAL
on success.
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q')
-rw-r--r-- | net/8021q/vlan.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index cda936b77d22..1583c5ef963f 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c | |||
@@ -810,6 +810,7 @@ static int vlan_ioctl_handler(void __user *arg) | |||
810 | err = -EINVAL; | 810 | err = -EINVAL; |
811 | break; | 811 | break; |
812 | case GET_VLAN_REALDEV_NAME_CMD: | 812 | case GET_VLAN_REALDEV_NAME_CMD: |
813 | err = 0; | ||
813 | vlan_dev_get_realdev_name(dev, args.u.device2); | 814 | vlan_dev_get_realdev_name(dev, args.u.device2); |
814 | if (copy_to_user(arg, &args, | 815 | if (copy_to_user(arg, &args, |
815 | sizeof(struct vlan_ioctl_args))) { | 816 | sizeof(struct vlan_ioctl_args))) { |
@@ -818,6 +819,7 @@ static int vlan_ioctl_handler(void __user *arg) | |||
818 | break; | 819 | break; |
819 | 820 | ||
820 | case GET_VLAN_VID_CMD: | 821 | case GET_VLAN_VID_CMD: |
822 | err = 0; | ||
821 | vlan_dev_get_vid(dev, &vid); | 823 | vlan_dev_get_vid(dev, &vid); |
822 | args.u.VID = vid; | 824 | args.u.VID = vid; |
823 | if (copy_to_user(arg, &args, | 825 | if (copy_to_user(arg, &args, |