lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Patrick McHardy
2008-07-05 21:26:27 -07:00
committed by David S. Miller
parent eca9ebac65
commit b3ce0325f2
4 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
net/8021q/vlan_dev.c
View File

@@ -507,18 +507,16 @@ int vlan_dev_set_egress_priority(const struct net_device *dev,
}
/* Flags are defined in the vlan_flags enum in include/linux/if_vlan.h file. */
int vlan_dev_set_vlan_flag(const struct net_device *dev,
u32 flag, short flag_val)
int vlan_dev_change_flags(const struct net_device *dev, u32 flags, u32 mask)
{
/* verify flag is supported */
if (flag == VLAN_FLAG_REORDER_HDR) {
if (flag_val)
vlan_dev_info(dev)->flags |= VLAN_FLAG_REORDER_HDR;
else
vlan_dev_info(dev)->flags &= ~VLAN_FLAG_REORDER_HDR;
return 0;
}
return -EINVAL;
struct vlan_dev_info *vlan = vlan_dev_info(dev);
u32 old_flags = vlan->flags;
if (mask & ~VLAN_FLAG_REORDER_HDR)
return -EINVAL;
vlan->flags = (old_flags & ~mask) | (flags & mask);
return 0;
}
void vlan_dev_get_realdev_name(const struct net_device *dev, char *result)