diff options
Diffstat (limited to 'net/8021q/vlan.c')
-rw-r--r-- | net/8021q/vlan.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index 8141e2dc510b..7a2625d2f9a0 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c | |||
@@ -543,7 +543,6 @@ static struct notifier_block vlan_notifier_block __read_mostly = { | |||
543 | static int vlan_ioctl_handler(struct net *net, void __user *arg) | 543 | static int vlan_ioctl_handler(struct net *net, void __user *arg) |
544 | { | 544 | { |
545 | int err; | 545 | int err; |
546 | unsigned short vid = 0; | ||
547 | struct vlan_ioctl_args args; | 546 | struct vlan_ioctl_args args; |
548 | struct net_device *dev = NULL; | 547 | struct net_device *dev = NULL; |
549 | 548 | ||
@@ -644,8 +643,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg) | |||
644 | 643 | ||
645 | case GET_VLAN_VID_CMD: | 644 | case GET_VLAN_VID_CMD: |
646 | err = 0; | 645 | err = 0; |
647 | vlan_dev_get_vid(dev, &vid); | 646 | args.u.VID = vlan_dev_vlan_id(dev); |
648 | args.u.VID = vid; | ||
649 | if (copy_to_user(arg, &args, | 647 | if (copy_to_user(arg, &args, |
650 | sizeof(struct vlan_ioctl_args))) | 648 | sizeof(struct vlan_ioctl_args))) |
651 | err = -EFAULT; | 649 | err = -EFAULT; |