vlan: Change vlan_dev_set_vlan_flag() to handle multiple flags at once

[uclinux-h8/linux.git] / net / 8021q / vlan.c

diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index ab2225d..b591bfc 100644 (file)
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -591,9 +591,9 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
                err = -EPERM;
                if (!capable(CAP_NET_ADMIN))
                        break;
-               err = vlan_dev_set_vlan_flag(dev,
-                                            args.u.flag,
-                                            args.vlan_qos);
+               err = vlan_dev_change_flags(dev,
+                                           args.vlan_qos ? args.u.flag : 0,
+                                           args.u.flag);
                break;
 
        case SET_VLAN_NAME_TYPE_CMD: