diff options
| author | Patrick McHardy <kaber@trash.net> | 2008-07-05 21:26:27 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-05 21:26:27 -0700 |
| commit | b3ce0325f2bf1bb737cb8fc7c349ce8fefdd9e40 (patch) | |
| tree | f2925e18555561b528b781c535c96bdbc0c809a9 /net/8021q/vlan_netlink.c | |
| parent | eca9ebac651f774d8b10fce7c5d173c3c3d3394f (diff) | |
| download | linux-stable-b3ce0325f2bf1bb737cb8fc7c349ce8fefdd9e40.tar.gz linux-stable-b3ce0325f2bf1bb737cb8fc7c349ce8fefdd9e40.tar.bz2 linux-stable-b3ce0325f2bf1bb737cb8fc7c349ce8fefdd9e40.zip | |
vlan: Change vlan_dev_set_vlan_flag() to handle multiple flags at once
Change vlan_dev_set_vlan_flag() to handle multiple flags at once and
rename to vlan_dev_change_flags(). This allows to to use it from the
netlink interface, which in turn allows to handle necessary adjustments
when changing flags centrally.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q/vlan_netlink.c')
| -rw-r--r-- | net/8021q/vlan_netlink.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c index c93e69ec28ed..fd7cb195d53f 100644 --- a/net/8021q/vlan_netlink.c +++ b/net/8021q/vlan_netlink.c @@ -75,7 +75,6 @@ static int vlan_validate(struct nlattr *tb[], struct nlattr *data[]) static int vlan_changelink(struct net_device *dev, struct nlattr *tb[], struct nlattr *data[]) { - struct vlan_dev_info *vlan = vlan_dev_info(dev); struct ifla_vlan_flags *flags; struct ifla_vlan_qos_mapping *m; struct nlattr *attr; @@ -83,8 +82,7 @@ static int vlan_changelink(struct net_device *dev, if (data[IFLA_VLAN_FLAGS]) { flags = nla_data(data[IFLA_VLAN_FLAGS]); - vlan->flags = (vlan->flags & ~flags->mask) | - (flags->flags & flags->mask); + vlan_dev_change_flags(dev, flags->flags, flags->mask); } if (data[IFLA_VLAN_INGRESS_QOS]) { nla_for_each_nested(attr, data[IFLA_VLAN_INGRESS_QOS], rem) { |