---

yaml --- r: 62793 b: refs/heads/master c: 3f5f434 h: refs/heads/master i: 62791: d9e5d1c v: v3
git-mirror · Jul 24, 2007 · c49da8d · c49da8d
1 parent 1185850
commit c49da8d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79d310d01ec2a55e0ac1810aee56886ebee58c53
+refs/heads/master: 3f5f4346b6d3c8bc33780a941da2473c4be2c989
diff --git a/trunk/net/8021q/vlan.c b/trunk/net/8021q/vlan.c
@@ -810,6 +810,7 @@ static int vlan_ioctl_handler(void __user *arg)
 		err = -EINVAL;
 		break;
 	case GET_VLAN_REALDEV_NAME_CMD:
+		err = 0;
 		vlan_dev_get_realdev_name(dev, args.u.device2);
 		if (copy_to_user(arg, &args,
 				 sizeof(struct vlan_ioctl_args))) {
@@ -818,6 +819,7 @@ static int vlan_ioctl_handler(void __user *arg)
 		break;
 
 	case GET_VLAN_VID_CMD:
+		err = 0;
 		vlan_dev_get_vid(dev, &vid);
 		args.u.VID = vid;
 		if (copy_to_user(arg, &args,